@dooboostore/dom-render 1.0.108 → 1.0.110

package/dist/cjs/DomRender.js

@@ -32,13 +32,12 @@ var import_RandomUtils = require("@dooboostore/core/random/RandomUtils");
 let eventManager = null;
 class DomRender {
   constructor(parameter, executeConfig) {
-    const s = DomRender.runSet(parameter);
+    const s = DomRender.runSet(parameter, executeConfig);
     this._config = s.config;
     this._target = s.target;
     this._rootObject = s.rootObject;
-    if (executeConfig && executeConfig?.autoGo) {
-      this._config.router?.go(executeConfig.autoGo);
-    }
+    this._router = s.config.router;
+    this._eventManager = s.config.eventManager;
   }
   get rootObject() {
     return this._rootObject;
@@ -46,13 +45,23 @@ class DomRender {
   get config() {
     return this._config;
   }
+  get router() {
+    return this._router;
+  }
+  get eventManager() {
+    return this._eventManager;
+  }
   get target() {
     return this._target;
   }
   static run(data) {
     return DomRender.runSet(data).rootObject;
   }
-  static runSet({ rootObject, target, config }) {
+  static runSet({
+    rootObject,
+    target,
+    config
+  }, executeConfig) {
     rootObject = typeof rootObject === "function" ? rootObject() : rootObject;
     let targetObject = rootObject;
     if ("_DomRender_isProxy" in rootObject) {
@@ -89,8 +98,20 @@ class DomRender {
     if (typeof CanvasRenderingContext2D !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === CanvasRenderingContext2D)) {
       targetConfig.proxyExcludeTyps.push(CanvasRenderingContext2D);
     }
-    if (typeof HTMLCanvasElement !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === HTMLCanvasElement)) {
-      targetConfig.proxyExcludeTyps.push(HTMLCanvasElement);
+    if (typeof CSSStyleDeclaration !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === CSSStyleDeclaration)) {
+      targetConfig.proxyExcludeTyps.push(CSSStyleDeclaration);
+    }
+    if (typeof Date !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === Date)) {
+      targetConfig.proxyExcludeTyps.push(Date);
+    }
+    if (typeof MutationObserver !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === IntersectionObserver)) {
+      targetConfig.proxyExcludeTyps.push(IntersectionObserver);
+    }
+    if (typeof IntersectionObserver !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === IntersectionObserver)) {
+      targetConfig.proxyExcludeTyps.push(IntersectionObserver);
+    }
+    if (typeof HTMLElement !== "undefined" && !targetConfig.proxyExcludeTyps.some((it) => it === HTMLElement)) {
+      targetConfig.proxyExcludeTyps.push(HTMLElement);
     }
     if (!targetConfig.proxyExcludeTyps.some((it) => it === import_RawSet.RawSet)) {
       targetConfig.proxyExcludeTyps.push(import_RawSet.RawSet);
@@ -107,11 +128,11 @@ class DomRender {
     if (!targetConfig.router) {
       let targetRouter;
       if ("routerType" in config && config?.routerType === "hash") {
-        targetRouter = new import_HashRouter.HashRouter({ rootObject: targetObject, window: targetConfig.window });
+        targetRouter = new import_HashRouter.HashRouter({ rootObject: targetObject, window: targetConfig.window, firstUrl: executeConfig?.firstUrl });
       } else if ("routerType" in config && config?.routerType === "path") {
-        targetRouter = new import_PathRouter.PathRouter({ rootObject: targetObject, window: targetConfig.window });
+        targetRouter = new import_PathRouter.PathRouter({ rootObject: targetObject, window: targetConfig.window, firstUrl: executeConfig?.firstUrl });
       } else if ("routerType" in config && typeof config?.routerType === "function") {
-        targetRouter = config.routerType(targetObject, targetConfig.window);
+        targetRouter = config.routerType(targetObject, targetConfig);
       } else if ("routerType" in config && typeof config?.routerType === "object") {
         targetRouter = config.routerType;
       }
@@ -127,26 +148,20 @@ class DomRender {
     return { rootObject: targetObject, config: targetConfig, target };
   }
   static createComponent(param) {
-    const component = import_RawSet.RawSet.createComponentTargetElement(
-      {
-        name: param.tagName ?? (typeof param.type === "function" ? param.type.name : param.type.constructor.name),
-        objFactory: (e, o, r2, counstructorParam) => {
-          return typeof param.type === "function" ? new param.type(...counstructorParam) : param.type;
-        },
-        noStrip: param.noStrip,
-        template: param.template ?? "",
-        styles: Array.isArray(param.styles) ? param.styles : param.styles ? [param.styles] : void 0
-      }
-    );
+    const component = import_RawSet.RawSet.createComponentTargetElement({
+      name: param.tagName ?? (typeof param.type === "function" ? param.type.name : param.type.constructor.name),
+      objFactory: (e, o, r2, counstructorParam) => {
+        return typeof param.type === "function" ? new param.type(...counstructorParam) : param.type;
+      },
+      noStrip: param.noStrip,
+      template: param.template ?? "",
+      styles: Array.isArray(param.styles) ? param.styles : param.styles ? [param.styles] : void 0
+    });
     return component;
   }
   // ?? 언제 쓰는거지?? 훔..
   static createAttribute(attrName, getThisObj, factory) {
-    const targetAttribute = import_RawSet.RawSet.createComponentTargetAttribute(
-      attrName,
-      getThisObj,
-      factory
-    );
+    const targetAttribute = import_RawSet.RawSet.createComponentTargetAttribute(attrName, getThisObj, factory);
     return targetAttribute;
   }
 }

package/dist/cjs/DomRender.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/DomRender.ts"],
-  "sourcesContent": ["import { DomRenderProxy } from './DomRenderProxy';\nimport { DomRenderConfig } from './configs/DomRenderConfig';\nimport { PathRouter } from './routers/PathRouter';\nimport { HashRouter } from './routers/HashRouter';\nimport { ConstructorType } from '@dooboostore/core/types';\nimport { DomRenderFinalProxy } from './types/Types';\nimport { RawSet } from './rawsets/RawSet';\nimport { DefaultMessenger } from './messenger/DefaultMessenger';\nimport { Router } from './routers/Router';\nimport { drComponent } from './components';\nimport { EventManager } from './events/EventManager';\nimport { RandomUtils } from '@dooboostore/core/random/RandomUtils';\n\nexport type DomRenderRunConfig<T = any> = Omit<DomRenderConfig<T>, 'router' | 'uuid' | 'eventManager' | 'messenger' | 'root' | 'rootElement'> & { routerType?: 'path' | 'hash' | ((obj: T, window: Window) => Router) | Router };\nexport type CreateComponentParam = { type: ConstructorType<any> | any, tagName?: string, noStrip?: boolean, template?: string, styles?: string[] | string };\nlet eventManager: EventManager | null = null;\nexport type DomRenderRunParameter<T extends object> = { rootObject: T | (() => T), target?: Element | null, config?: DomRenderRunConfig | DomRenderConfig };\n\nexport class DomRender<T extends object = any> {\n  private _config: DomRenderConfig;\n  private _target: Element | null | undefined;\n  private _rootObject: T;\n\n  constructor(parameter: DomRenderRunParameter<T>, executeConfig?: { autoGo?: string }) {\n    const s = DomRender.runSet(parameter);\n    this._config = s.config;\n    this._target = s.target;\n    this._rootObject = s.rootObject;\n    if (executeConfig && executeConfig?.autoGo) {\n      this._config.router?.go(executeConfig.autoGo);\n    }\n  }\n\n  public get rootObject(): T {\n    return this._rootObject;\n  }\n\n  public get config(): DomRenderConfig {\n    return this._config;\n  }\n\n  public get target(): Element | null |undefined {\n    return this._target;\n  }\n\n  public static run<T extends object>(data: DomRenderRunParameter<T>): T {\n    return DomRender.runSet(data).rootObject;\n  }\n\n  public static runSet<T extends object>({rootObject, target, config}: DomRenderRunParameter<T>): { rootObject: T, target?: Element | null, config: DomRenderConfig } {\n    // public static run<T extends object>({rootObject, target, config}: DomRenderRunParameter<T>): T {\n    //   console.log('runSet')\n    rootObject = typeof rootObject === 'function' ? rootObject() : rootObject;\n    let targetObject = rootObject;\n    if ('_DomRender_isProxy' in rootObject) {\n      if (target) {\n        ((rootObject as any)._DomRender_proxy as DomRenderProxy<T>).initRender(target);\n      }\n      targetObject = rootObject;\n      // return targetObject;\n      return {rootObject: targetObject, target, config: (rootObject as any)._domRender_config};\n    }\n    const targetConfig = Object.assign({}, config) as DomRenderConfig;\n    eventManager ??= new EventManager(targetConfig.window);\n\n    targetConfig.uuid = RandomUtils.uuid4();\n    targetConfig.messenger = DomRenderFinalProxy.final(targetConfig.messenger ?? new DefaultMessenger(targetConfig));\n    targetConfig.proxyExcludeTyps = targetConfig.proxyExcludeTyps ?? [];\n    targetConfig.targetElements ??= [];\n\n\n    if (typeof Window !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Window)) {\n      targetConfig.proxyExcludeTyps.push(Window);\n    }\n    if (typeof Map !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Map)) {\n      targetConfig.proxyExcludeTyps.push(Map);\n    }\n    if (typeof Set !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Set)) {\n      targetConfig.proxyExcludeTyps.push(Set);\n    }\n    if (typeof Promise !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Promise)) {\n      targetConfig.proxyExcludeTyps.push(Promise);\n    }\n    if (typeof ResizeObserver !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === ResizeObserver)) {\n      targetConfig.proxyExcludeTyps.push(ResizeObserver);\n    }\n    if (typeof ImageBitmap !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === ImageBitmap)) {\n      targetConfig.proxyExcludeTyps.push(ImageBitmap);\n    }\n    if (typeof CanvasRenderingContext2D !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === CanvasRenderingContext2D)) {\n      targetConfig.proxyExcludeTyps.push(CanvasRenderingContext2D);\n    }\n    if (typeof HTMLCanvasElement !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === HTMLCanvasElement)) {\n      targetConfig.proxyExcludeTyps.push(HTMLCanvasElement);\n    }\n    if (!targetConfig.proxyExcludeTyps.some(it => it === RawSet)) {\n      targetConfig.proxyExcludeTyps.push(RawSet);\n    }\n    if (!targetConfig.proxyExcludeTyps.some(it => it === DomRender)) {\n      targetConfig.proxyExcludeTyps.push(DomRender);\n    }\n    targetConfig.rootElement = target;\n    targetConfig.eventManager = eventManager;\n    // (targetConfig.window as any).domRender ??= {configs: []};\n    // (targetConfig.window as any).domRender.configs.push(targetConfig);\n    const domRender = new DomRenderProxy(rootObject, target, targetConfig);\n    const dest = new Proxy(rootObject, domRender);\n    targetObject = dest;\n    targetConfig.root = targetObject;\n\n    // proxy \uB41C targetObject\uB97C \uB123\uC5B4\uC918\uC57C\uB418\uC11C \uB4A4\uCABD\uC5D0\uC11C router\uB97C \uC0DD\uC131\uD574\uC57C\uD568\n    if (!targetConfig.router) {\n      let targetRouter: Router<any> | undefined;\n      if ('routerType' in config && config?.routerType === 'hash') {\n        targetRouter = new HashRouter({rootObject: targetObject, window: targetConfig.window});\n      } else if ('routerType' in config && config?.routerType === 'path') {\n        targetRouter = new PathRouter({rootObject: targetObject, window: targetConfig.window});\n      } else if ('routerType' in config && typeof config?.routerType === 'function') {\n        targetRouter = config.routerType(targetObject, targetConfig.window);\n      } else if ('routerType' in config && typeof config?.routerType === 'object') {\n        targetRouter = config.routerType;\n      }\n      targetConfig.router = targetRouter;\n    }\n\n    for (const value of Object.values(drComponent)) {\n      const a = value(targetConfig, DomRender);\n      if (!targetConfig.targetElements.some(it => it.name === a.name)) {\n        targetConfig.targetElements.push(a);\n      }\n    }\n    // console.log('cccccccccccccccccc', targetRouter)\n    // targetRouter.go({path: targetRouter.getUrl()})\n    // if (!config.router) {\n    //   if (config.routerType === 'path') {\n    //     config.router = new PathRouter(targetObject, config.window);\n    //   } else if (config.routerType === 'hash') {\n    //     config.router = new HashRouter(targetObject, config.window);\n    //   } else { // none\n    //     config.router = new HashRouter(targetObject, config.window);\n    //   }\n    // }\n    domRender.run(targetObject);\n    return {rootObject: targetObject, config: targetConfig, target};\n    // return targetObject;\n  }\n\n  public static createComponent(param: CreateComponentParam) {\n    // console.log('===>', typeof param.type, param.type.name, param.type.constructor.name)\n    const component = RawSet.createComponentTargetElement(\n      {\n        name: param.tagName ?? (typeof param.type === 'function' ? param.type.name : param.type.constructor.name),\n        objFactory: (e, o, r2, counstructorParam) => {\n          return typeof param.type === 'function' ? new param.type(...counstructorParam) : param.type;\n        },\n        noStrip: param.noStrip,\n        template: param.template ?? '',\n        styles: Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined)\n      }\n    );\n    return component;\n  }\n\n  // ?? \uC5B8\uC81C \uC4F0\uB294\uAC70\uC9C0?? \uD6D4..\n  public static createAttribute(attrName: string, getThisObj: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => any, factory: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment) {\n    const targetAttribute = RawSet.createComponentTargetAttribute(\n      attrName,\n      getThisObj,\n      factory\n    );\n    return targetAttribute;\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA+B;AAE/B,wBAA2B;AAC3B,wBAA2B;AAE3B,mBAAoC;AACpC,oBAAuB;AACvB,8BAAiC;AAEjC,wBAA4B;AAC5B,0BAA6B;AAC7B,yBAA4B;AAI5B,IAAI,eAAoC;AAGjC,MAAM,UAAkC;AAAA,EAK7C,YAAY,WAAqC,eAAqC;AACpF,UAAM,IAAI,UAAU,OAAO,SAAS;AACpC,SAAK,UAAU,EAAE;AACjB,SAAK,UAAU,EAAE;AACjB,SAAK,cAAc,EAAE;AACrB,QAAI,iBAAiB,eAAe,QAAQ;AAC1C,WAAK,QAAQ,QAAQ,GAAG,cAAc,MAAM;AAAA,IAC9C;AAAA,EACF;AAAA,EAEA,IAAW,aAAgB;AACzB,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAW,SAA0B;AACnC,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAW,SAAoC;AAC7C,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,OAAc,IAAsB,MAAmC;AACrE,WAAO,UAAU,OAAO,IAAI,EAAE;AAAA,EAChC;AAAA,EAEA,OAAc,OAAyB,EAAC,YAAY,QAAQ,OAAM,GAAkG;AAGlK,iBAAa,OAAO,eAAe,aAAa,WAAW,IAAI;AAC/D,QAAI,eAAe;AACnB,QAAI,wBAAwB,YAAY;AACtC,UAAI,QAAQ;AACV,QAAE,WAAmB,iBAAuC,WAAW,MAAM;AAAA,MAC/E;AACA,qBAAe;AAEf,aAAO,EAAC,YAAY,cAAc,QAAQ,QAAS,WAAmB,kBAAiB;AAAA,IACzF;AACA,UAAM,eAAe,OAAO,OAAO,CAAC,GAAG,MAAM;AAC7C,oCAAiB,IAAI,iCAAa,aAAa,MAAM;AAErD,iBAAa,OAAO,+BAAY,MAAM;AACtC,iBAAa,YAAY,iCAAoB,MAAM,aAAa,aAAa,IAAI,yCAAiB,YAAY,CAAC;AAC/G,iBAAa,mBAAmB,aAAa,oBAAoB,CAAC;AAClE,iBAAa,mBAAb,aAAa,iBAAmB,CAAC;AAGjC,QAAI,OAAO,WAAW,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,MAAM,GAAG;AAC7F,mBAAa,iBAAiB,KAAK,MAAM;AAAA,IAC3C;AACA,QAAI,OAAO,QAAQ,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,GAAG,GAAG;AACvF,mBAAa,iBAAiB,KAAK,GAAG;AAAA,IACxC;AACA,QAAI,OAAO,QAAQ,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,GAAG,GAAG;AACvF,mBAAa,iBAAiB,KAAK,GAAG;AAAA,IACxC;AACA,QAAI,OAAO,YAAY,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,OAAO,GAAG;AAC/F,mBAAa,iBAAiB,KAAK,OAAO;AAAA,IAC5C;AACA,QAAI,OAAO,mBAAmB,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,cAAc,GAAG;AAC7G,mBAAa,iBAAiB,KAAK,cAAc;AAAA,IACnD;AACA,QAAI,OAAO,gBAAgB,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,WAAW,GAAG;AACvG,mBAAa,iBAAiB,KAAK,WAAW;AAAA,IAChD;AACA,QAAI,OAAO,6BAA6B,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,wBAAwB,GAAG;AACjI,mBAAa,iBAAiB,KAAK,wBAAwB;AAAA,IAC7D;AACA,QAAI,OAAO,sBAAsB,eAAe,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,iBAAiB,GAAG;AACnH,mBAAa,iBAAiB,KAAK,iBAAiB;AAAA,IACtD;AACA,QAAI,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,oBAAM,GAAG;AAC5D,mBAAa,iBAAiB,KAAK,oBAAM;AAAA,IAC3C;AACA,QAAI,CAAC,aAAa,iBAAiB,KAAK,QAAM,OAAO,SAAS,GAAG;AAC/D,mBAAa,iBAAiB,KAAK,SAAS;AAAA,IAC9C;AACA,iBAAa,cAAc;AAC3B,iBAAa,eAAe;AAG5B,UAAM,YAAY,IAAI,qCAAe,YAAY,QAAQ,YAAY;AACrE,UAAM,OAAO,IAAI,MAAM,YAAY,SAAS;AAC5C,mBAAe;AACf,iBAAa,OAAO;AAGpB,QAAI,CAAC,aAAa,QAAQ;AACxB,UAAI;AACJ,UAAI,gBAAgB,UAAU,QAAQ,eAAe,QAAQ;AAC3D,uBAAe,IAAI,6BAAW,EAAC,YAAY,cAAc,QAAQ,aAAa,OAAM,CAAC;AAAA,MACvF,WAAW,gBAAgB,UAAU,QAAQ,eAAe,QAAQ;AAClE,uBAAe,IAAI,6BAAW,EAAC,YAAY,cAAc,QAAQ,aAAa,OAAM,CAAC;AAAA,MACvF,WAAW,gBAAgB,UAAU,OAAO,QAAQ,eAAe,YAAY;AAC7E,uBAAe,OAAO,WAAW,cAAc,aAAa,MAAM;AAAA,MACpE,WAAW,gBAAgB,UAAU,OAAO,QAAQ,eAAe,UAAU;AAC3E,uBAAe,OAAO;AAAA,MACxB;AACA,mBAAa,SAAS;AAAA,IACxB;AAEA,eAAW,SAAS,OAAO,OAAO,6BAAW,GAAG;AAC9C,YAAM,IAAI,MAAM,cAAc,SAAS;AACvC,UAAI,CAAC,aAAa,eAAe,KAAK,QAAM,GAAG,SAAS,EAAE,IAAI,GAAG;AAC/D,qBAAa,eAAe,KAAK,CAAC;AAAA,MACpC;AAAA,IACF;AAYA,cAAU,IAAI,YAAY;AAC1B,WAAO,EAAC,YAAY,cAAc,QAAQ,cAAc,OAAM;AAAA,EAEhE;AAAA,EAEA,OAAc,gBAAgB,OAA6B;AAEzD,UAAM,YAAY,qBAAO;AAAA,MACvB;AAAA,QACE,MAAM,MAAM,YAAY,OAAO,MAAM,SAAS,aAAa,MAAM,KAAK,OAAO,MAAM,KAAK,YAAY;AAAA,QACpG,YAAY,CAAC,GAAG,GAAG,IAAI,sBAAsB;AAC3C,iBAAO,OAAO,MAAM,SAAS,aAAa,IAAI,MAAM,KAAK,GAAG,iBAAiB,IAAI,MAAM;AAAA,QACzF;AAAA,QACA,SAAS,MAAM;AAAA,QACf,UAAU,MAAM,YAAY;AAAA,QAC5B,QAAQ,MAAM,QAAQ,MAAM,MAAM,IAAI,MAAM,SAAU,MAAM,SAAS,CAAC,MAAM,MAAM,IAAI;AAAA,MACxF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA;AAAA,EAGA,OAAc,gBAAgB,UAAkB,YAAoF,SAA8F;AAChO,UAAM,kBAAkB,qBAAO;AAAA,MAC7B;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import { DomRenderProxy } from './DomRenderProxy';\nimport { DomRenderConfig } from './configs/DomRenderConfig';\nimport { PathRouter } from './routers/PathRouter';\nimport { HashRouter } from './routers/HashRouter';\nimport { ConstructorType } from '@dooboostore/core/types';\nimport { DomRenderFinalProxy } from './types/Types';\nimport { RawSet } from './rawsets/RawSet';\nimport { DefaultMessenger } from './messenger/DefaultMessenger';\nimport { Router } from './routers/Router';\nimport { drComponent } from './components';\nimport { EventManager } from './events/EventManager';\nimport { RandomUtils } from '@dooboostore/core/random/RandomUtils';\n\nexport type DomRenderRunConfig<T = any> = Omit<DomRenderConfig<T>, 'router' | 'uuid' | 'eventManager' | 'messenger' | 'root' | 'rootElement'> & { routerType?: 'path' | 'hash' | ((obj: T, targetConfig: DomRenderConfig) => Router) | Router };\nexport type CreateComponentParam = { type: ConstructorType<any> | any, tagName?: string, noStrip?: boolean, template?: string, styles?: string[] | string };\nlet eventManager: EventManager | null = null;\nexport type DomRenderRunParameter<T extends object> = { rootObject: T | (() => T), target?: Element | null, config?: DomRenderRunConfig | DomRenderConfig };\n\nexport type ExecuteConfig = { firstUrl?: string };\n\nexport class DomRender<T extends object = any> {\n  private _config: DomRenderConfig;\n  private _target: Element | null | undefined;\n  private _rootObject: T;\n  private _router: Router;\n  private _eventManager: EventManager;\n\n  constructor(parameter: DomRenderRunParameter<T>, executeConfig?: ExecuteConfig) {\n    const s = DomRender.runSet(parameter,executeConfig);\n    this._config = s.config;\n    this._target = s.target;\n    this._rootObject = s.rootObject;\n    this._router = s.config.router;\n    this._eventManager = s.config.eventManager;\n    // if (executeConfig && executeConfig?.autoGo) {\n    //   this._config.router?.go(executeConfig.autoGo);\n    // }\n  }\n\n  public get rootObject(): T {\n    return this._rootObject;\n  }\n\n  public get config(): DomRenderConfig {\n    return this._config;\n  }\n  public get router(): Router {\n    return this._router;\n  }\n\n  public get eventManager(): EventManager {\n    return this._eventManager;\n  }\n  public get target(): Element | null | undefined {\n    return this._target;\n  }\n\n  public static run<T extends object>(data: DomRenderRunParameter<T>): T {\n    return DomRender.runSet(data).rootObject;\n  }\n\n  public static runSet<T extends object>({\n    rootObject,\n    target,\n    config\n  }: DomRenderRunParameter<T>, executeConfig?: ExecuteConfig): { rootObject: T; target?: Element | null; config: DomRenderConfig } {\n    // public static run<T extends object>({rootObject, target, config}: DomRenderRunParameter<T>): T {\n    //   console.log('runSet')\n    rootObject = typeof rootObject === 'function' ? rootObject() : rootObject;\n    let targetObject = rootObject;\n    if ('_DomRender_isProxy' in rootObject) {\n      if (target) {\n        ((rootObject as any)._DomRender_proxy as DomRenderProxy<T>).initRender(target);\n      }\n      targetObject = rootObject;\n      // return targetObject;\n      return { rootObject: targetObject, target, config: (rootObject as any)._domRender_config };\n    }\n    const targetConfig = Object.assign({}, config) as DomRenderConfig;\n    eventManager ??= new EventManager(targetConfig.window);\n\n    targetConfig.uuid = RandomUtils.uuid4();\n    targetConfig.messenger = DomRenderFinalProxy.final(targetConfig.messenger ?? new DefaultMessenger(targetConfig));\n    targetConfig.proxyExcludeTyps = targetConfig.proxyExcludeTyps ?? [];\n    targetConfig.targetElements ??= [];\n\n    if (typeof Window !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Window)) {\n      targetConfig.proxyExcludeTyps.push(Window);\n    }\n    if (typeof Map !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Map)) {\n      targetConfig.proxyExcludeTyps.push(Map);\n    }\n    if (typeof Set !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Set)) {\n      targetConfig.proxyExcludeTyps.push(Set);\n    }\n    if (typeof Promise !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Promise)) {\n      targetConfig.proxyExcludeTyps.push(Promise);\n    }\n    if (typeof ResizeObserver !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === ResizeObserver)) {\n      targetConfig.proxyExcludeTyps.push(ResizeObserver);\n    }\n    if (typeof ImageBitmap !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === ImageBitmap)) {\n      targetConfig.proxyExcludeTyps.push(ImageBitmap);\n    }\n    if ( typeof CanvasRenderingContext2D !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === CanvasRenderingContext2D) ) {\n      targetConfig.proxyExcludeTyps.push(CanvasRenderingContext2D);\n    }\n    if ( typeof CSSStyleDeclaration !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === CSSStyleDeclaration) ) {\n      targetConfig.proxyExcludeTyps.push(CSSStyleDeclaration);\n    }\n    if ( typeof Date !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === Date) ) {\n      targetConfig.proxyExcludeTyps.push(Date);\n    }\n    if ( typeof MutationObserver !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === IntersectionObserver) ) {\n      targetConfig.proxyExcludeTyps.push(IntersectionObserver);\n    }\n    if ( typeof IntersectionObserver !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === IntersectionObserver) ) {\n      targetConfig.proxyExcludeTyps.push(IntersectionObserver);\n    }\n    if (typeof HTMLElement !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === HTMLElement)) {\n      targetConfig.proxyExcludeTyps.push(HTMLElement);\n    }\n    // if (typeof HTMLCanvasElement !== 'undefined' && !targetConfig.proxyExcludeTyps.some(it => it === HTMLCanvasElement)) {\n    //   targetConfig.proxyExcludeTyps.push(HTMLCanvasElement);\n    // }\n    if (!targetConfig.proxyExcludeTyps.some(it => it === RawSet)) {\n      targetConfig.proxyExcludeTyps.push(RawSet);\n    }\n    if (!targetConfig.proxyExcludeTyps.some(it => it === DomRender)) {\n      targetConfig.proxyExcludeTyps.push(DomRender);\n    }\n    targetConfig.rootElement = target;\n    targetConfig.eventManager = eventManager;\n    // (targetConfig.window as any).domRender ??= {configs: []};\n    // (targetConfig.window as any).domRender.configs.push(targetConfig);\n    const domRender = new DomRenderProxy(rootObject, target, targetConfig);\n    const dest = new Proxy(rootObject, domRender);\n    targetObject = dest;\n    targetConfig.root = targetObject;\n\n    // proxy \uB41C targetObject\uB97C \uB123\uC5B4\uC918\uC57C\uB418\uC11C \uB4A4\uCABD\uC5D0\uC11C router\uB97C \uC0DD\uC131\uD574\uC57C\uD568\n    if (!targetConfig.router) {\n      let targetRouter: Router<any> | undefined;\n      if ('routerType' in config && config?.routerType === 'hash') {\n        targetRouter = new HashRouter({ rootObject: targetObject, window: targetConfig.window, firstUrl: executeConfig?.firstUrl });\n      } else if ('routerType' in config && config?.routerType === 'path') {\n        targetRouter = new PathRouter({ rootObject: targetObject, window: targetConfig.window, firstUrl: executeConfig?.firstUrl });\n      } else if ('routerType' in config && typeof config?.routerType === 'function') {\n        targetRouter = config.routerType(targetObject, targetConfig);\n      } else if ('routerType' in config && typeof config?.routerType === 'object') {\n        targetRouter = config.routerType;\n      }\n      targetConfig.router = targetRouter;\n    }\n\n    for (const value of Object.values(drComponent)) {\n      const a = value(targetConfig, DomRender);\n      if (!targetConfig.targetElements.some(it => it.name === a.name)) {\n        targetConfig.targetElements.push(a);\n      }\n    }\n    // console.log('cccccccccccccccccc', targetRouter)\n    // targetRouter.go({path: targetRouter.getUrl()})\n    // if (!config.router) {\n    //   if (config.routerType === 'path') {\n    //     config.router = new PathRouter(targetObject, config.window);\n    //   } else if (config.routerType === 'hash') {\n    //     config.router = new HashRouter(targetObject, config.window);\n    //   } else { // none\n    //     config.router = new HashRouter(targetObject, config.window);\n    //   }\n    // }\n    domRender.run(targetObject);\n    return { rootObject: targetObject, config: targetConfig, target };\n    // return targetObject;\n  }\n\n  public static createComponent(param: CreateComponentParam) {\n    // console.log('===>', typeof param.type, param.type.name, param.type.constructor.name)\n    const component = RawSet.createComponentTargetElement({\n      name: param.tagName ?? (typeof param.type === 'function' ? param.type.name : param.type.constructor.name),\n      objFactory: (e, o, r2, counstructorParam) => {\n        return typeof param.type === 'function' ? new param.type(...counstructorParam) : param.type;\n      },\n      noStrip: param.noStrip,\n      template: param.template ?? '',\n      styles: Array.isArray(param.styles) ? param.styles : param.styles ? [param.styles] : undefined\n    });\n    return component;\n  }\n\n  // ?? \uC5B8\uC81C \uC4F0\uB294\uAC70\uC9C0?? \uD6D4..\n  public static createAttribute(\n    attrName: string,\n    getThisObj: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => any,\n    factory: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment\n  ) {\n    const targetAttribute = RawSet.createComponentTargetAttribute(attrName, getThisObj, factory);\n    return targetAttribute;\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/DomRenderProxy.js

@@ -44,7 +44,21 @@ var import_OnChildRenderedByProperty = require("./lifecycle/OnChildRenderedByPro
 var import_ObjectUtils = require("@dooboostore/core/object/ObjectUtils");
 var import_ValidUtils = require("@dooboostore/core/valid/ValidUtils");
 var import_OnProxyDomRender = require("./lifecycle/OnProxyDomRender");
-const excludeGetSetPropertys = ["onBeforeReturnGet", "onBeforeReturnSet", "__domrender_components", "__render", "_DomRender_isFinal", "_domRender_ref", "_rawSets", "_domRender_proxy", "_targets", "_DomRender_origin", "_DomRender_ref", "_DomRender_proxy"];
+var import_OnRawSetRendered = require("./lifecycle/OnRawSetRendered");
+const excludeGetSetPropertys = [
+  "onBeforeReturnGet",
+  "onBeforeReturnSet",
+  "__domrender_components",
+  "__render",
+  "_DomRender_isFinal",
+  "_domRender_ref",
+  "_rawSets",
+  "_domRender_proxy",
+  "_targets",
+  "_DomRender_origin",
+  "_DomRender_ref",
+  "_DomRender_proxy"
+];
 const isWrapProxyDomRenderProxy = (obj) => {
   return obj && typeof obj === "object" && "_DomRender_isProxy" in obj;
 };
@@ -85,9 +99,9 @@ class DomRenderProxy {
     return import_Types.DomRenderFinalProxy.final(obj);
   }
   static isFinal(obj) {
-    return import_Types.DomRenderFinalProxy.isFinal(obj);
+    return import_ValidUtils.ValidUtils.isNull(obj) || import_Types.DomRenderFinalProxy.isFinal(obj);
   }
-  run(objProxy) {
+  async run(objProxy) {
     this._domRender_proxy = objProxy;
     if ((0, import_OnProxyDomRender.isOnProxyDomRender)(objProxy)) {
       objProxy.onProxyDomRender(this._domRender_config);
@@ -112,18 +126,18 @@ class DomRenderProxy {
         }
       });
     }
-    this._targets.forEach((target) => {
-      this.initRender(target);
-    });
+    for (let target of this._targets) {
+      await this.initRender(target);
+    }
   }
-  initRender(target, rawSet) {
+  async initRender(target, rawSet) {
     if (target instanceof Element) {
       target.innerHTML = target.innerHTML.replace(/@this@/g, "this");
     }
     const onCreate = target.getAttribute?.(import_RawSet.RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME);
     let createParam = [];
     if (onCreate) {
-      createParam = import_ScriptUtils.ScriptUtils.evaluateReturn(onCreate, this._domRender_proxy);
+      createParam = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(onCreate, this._domRender_proxy);
       if (!Array.isArray(createParam)) {
         createParam = [createParam];
       }
@@ -136,7 +150,11 @@ class DomRenderProxy {
     }
     this._targets.add(target);
     const rawSets = import_RawSet.RawSet.checkPointCreates(target, this._domRender_proxy, this._domRender_config);
-    this._domRender_config.eventManager.applyEvent(this._domRender_proxy, this._domRender_config.eventManager.findAttrElements(target, this._domRender_config), this._domRender_config);
+    this._domRender_config.eventManager.applyEvent(
+      this._domRender_proxy,
+      this._domRender_config.eventManager.findAttrElements(target, this._domRender_config),
+      this._domRender_config
+    );
     rawSets.forEach((it) => {
       const variables = it.getUsingTriggerVariables(this._domRender_config);
       if (variables.size <= 0) {
@@ -147,16 +165,20 @@ class DomRenderProxy {
         });
       }
     });
-    this.render(this.getRawSets()).then((it) => {
+    const targetRawSets = await this.render(this.getRawSets());
+    for (let targetRawSet of targetRawSets) {
       const onInit = target.getAttribute?.(import_RawSet.RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME);
       let initParam;
       if (onCreate) {
         initParam = import_ScriptUtils.ScriptUtils.evaluateReturn(onCreate, this._domRender_proxy);
       }
       if ((0, import_OnInitRender.isOnInitRender)(this._domRender_proxy)) {
-        this._domRender_proxy.onInitRender(initParam, rawSet ?? { dataSet: { config: this._domRender_config } });
+        await this._domRender_proxy.onInitRender(
+          initParam,
+          rawSet ?? { dataSet: { config: this._domRender_config } }
+        );
       }
-    });
+    }
   }
   getRawSets() {
     const set = /* @__PURE__ */ new Set();
@@ -181,6 +203,7 @@ class DomRenderProxy {
       it.getUsingTriggerVariables(this._domRender_config).forEach((path) => {
         this.addRawSet(path, it);
       });
+      let renderResult;
       if (it.isConnected) {
         const targetAttrMap = it.point.node?.getAttribute?.(import_EventManager.EventManager.normalAttrMapAttrName);
         if (it.detect?.action) {
@@ -188,9 +211,12 @@ class DomRenderProxy {
         } else if (it.type === import_RawSetType.RawSetType.TARGET_ELEMENT && it.dataSet?.render?.currentThis && fullPathStr && targetAttrMap) {
           new Map(JSON.parse(targetAttrMap)).forEach((v, k) => {
             var _a;
-            const isUsing = import_EventManager.EventManager.isUsingThisVar(v, `this.${fullPathStr}`);
+            const isUsing = v.variablePaths.some((it2) => import_EventManager.EventManager.isUsingThisVar(it2.inner, `this.${fullPathStr}`));
             if (isUsing) {
-              const targetAttrObject = import_RawSet.RawSet.getAttributeObject(it.point.node, { script: it.dataSet?.render?.renderScript ?? "", obj: Object.assign(this._domRender_proxy ?? {}, { __render: it.dataSet?.render }) });
+              const targetAttrObject = import_RawSet.RawSet.getAttributeObject(it.point.node, {
+                script: it.dataSet?.render?.renderScript ?? "",
+                obj: Object.assign(this._domRender_proxy ?? {}, { __render: it.dataSet?.render })
+              });
               (_a = it.dataSet).render ?? (_a.render = {});
               it.dataSet.render.attribute = targetAttrObject;
               if ((0, import_OnChangeAttrRender.isOnChangeAttrRender)(it.dataSet?.render?.currentThis)) {
@@ -200,13 +226,18 @@ class DomRenderProxy {
           });
         } else {
           const rawSets2 = await it.render(this._domRender_proxy, this._domRender_config);
-          if (rawSets2 && rawSets2.length > 0) {
-            await this.render(rawSets2);
+          renderResult = rawSets2;
+          if (rawSets2 && rawSets2.raws.length > 0) {
+            await this.render(rawSets2.raws);
           }
         }
       } else {
         removeRawSets.push(it);
       }
+      const t = it.findNearThis(this._domRender_proxy);
+      if ((0, import_OnRawSetRendered.isOnRawSetRendered)(t)) {
+        await t.onRawSetRendered(it, { path: fullPathStr, renderResult });
+      }
     }
     if (removeRawSets.length > 0) {
       this.removeRawSet(...removeRawSets);
@@ -229,7 +260,11 @@ class DomRenderProxy {
           it.forEach((sit) => {
             try {
               const concat = pathInfos.concat([[{ path: sit, obj: key }]]);
-              const items = key._DomRender_proxy?.root(concat, value, lastDoneExecute);
+              const items = key._DomRender_proxy?.root(
+                concat,
+                value,
+                lastDoneExecute
+              );
               fullPaths.push(items.flat());
             } catch (e) {
             }
@@ -251,7 +286,7 @@ class DomRenderProxy {
           const firstTargets = this._rawSets.get(firstPathStr);
           const firstTargetDictionary = [];
           firstTargets?.forEach((it) => {
-            const type = it.point.start.getAttribute?.("type");
+            const type = it.point.start?.getAttribute?.("type");
             if (type === import_RawSetOperatorType.RawSetOperatorType.DR_THIS_PROPERTY) {
               firstTargetDictionary.push(it);
             }
@@ -265,10 +300,19 @@ class DomRenderProxy {
               if (value === void 0) {
                 const rawSet = it.getHasRawSet(lastPropertyName);
                 rawSet?.remove();
-                startElement.setAttribute(import_RawSet.RawSet.DR_HAS_KEYS_OPTIONNAME, keys.filter((it2) => it2 !== lastPropertyName).join(","));
+                startElement.setAttribute(
+                  import_RawSet.RawSet.DR_HAS_KEYS_OPTIONNAME,
+                  keys.filter((it2) => it2 !== lastPropertyName).join(",")
+                );
               }
               if (!keys.includes(lastPropertyName)) {
-                const raws = import_DrThisProperty.DrThisProperty.append(this._domRender_proxy, fullPathStr, lastPropertyName, it, this._domRender_config);
+                const raws = import_DrThisProperty.DrThisProperty.append(
+                  this._domRender_proxy,
+                  fullPathStr,
+                  lastPropertyName,
+                  it,
+                  this._domRender_config
+                );
                 if (raws) {
                   rawSets.push(...raws);
                 }
@@ -288,10 +332,19 @@ class DomRenderProxy {
           } else if (iterable) {
             rData = await this.render(Array.from(iterable), fullPathStr);
           }
+          const Node = this._domRender_config.window.Node;
           this._targets.forEach((it) => {
             if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
-              const targets = this._domRender_config.eventManager.findAttrElements(it, this._domRender_config);
-              this._domRender_config.eventManager.changeVar(this._domRender_proxy, targets, `this.${fullPathStr}`, this._domRender_config);
+              const targets = this._domRender_config.eventManager.findAttrElements(
+                it,
+                this._domRender_config
+              );
+              this._domRender_config.eventManager.changeVar(
+                this._domRender_proxy,
+                targets,
+                `this.${fullPathStr}`,
+                this._domRender_config
+              );
             }
           });
           if (rData?.length > 0 && (0, import_OnChildRenderedByProperty.isOnChildRenderedByProperty)(data)) {
@@ -323,49 +376,64 @@ class DomRenderProxy {
       fullPathInfo = this.root([[{ path: p, obj: this._domRender_proxy }]], value);
     }
     const rootElement = this._domRender_config.rootElement ?? this._domRender_config.window.document;
-    import_DocumentUtils.DocumentUtils.querySelectorAllByAttributeName(rootElement, import_EventManager.EventManager.normalAttrMapAttrName)?.forEach((elementInfo) => {
-      const targets = new Map(import_ScriptUtils.ScriptUtils.evaluateReturn(elementInfo.value));
-      Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(import_types.isDefined).flatMap(([key, valueScript]) => {
-        return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
-      }).forEach((it) => {
-        const optionalPath = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(it.valueScript);
-        const value1 = import_ScriptUtils.ScriptUtils.evaluateReturn(optionalPath, it.pathInfo.obj);
-        if (value1 === null) {
-          elementInfo.element.removeAttribute(it.key);
-          elementInfo.element[it.key] = null;
-        } else {
-          elementInfo.element.setAttribute(it.key, value1);
-          elementInfo.element[it.key] = value1;
-        }
-      });
-    });
-    import_DocumentUtils.DocumentUtils.querySelectorAllByAttributeName(rootElement, import_EventManager.EventManager.linkTargetMapAttrName)?.forEach((elementInfo) => {
-      const targets = new Map(import_ScriptUtils.ScriptUtils.evaluateReturn(elementInfo.value));
-      Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(import_types.isDefined).flatMap(([key, valueScript]) => {
-        return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
-      }).forEach((info) => {
-        const value1 = import_ScriptUtils.ScriptUtils.evaluateReturn(info.valueScript, info.pathInfo.obj);
-        const applyAttributeName = import_EventManager.EventManager.linkAttrs.find((it) => it.name === info.key);
-        if (applyAttributeName) {
+    import_DocumentUtils.DocumentUtils.querySelectorAllByAttributeName(rootElement, import_EventManager.EventManager.normalAttrMapAttrName)?.forEach(
+      (elementInfo) => {
+        const targets = new Map(
+          import_ObjectUtils.ObjectUtils.Script.evaluateReturn(elementInfo.value)
+        );
+        Array.from(targets.entries()).filter(import_types.isDefined).flatMap(([key, valueScript]) => {
+          return fullPathInfo.flat().filter((it) => valueScript.variablePaths?.some((vit) => vit.inner.includes(`this.${it.path}`))).flatMap((it) => ({ key, valueScript, pathInfo: it }));
+        }).forEach((it) => {
+          const variablePaths = it.valueScript.variablePaths;
+          let targetScript = it.valueScript.originalAttrValue;
+          variablePaths.forEach((it2) => {
+            let r = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(it2.inner);
+            targetScript = targetScript.replaceAll(it2.origin, `\${${r}}`);
+          });
+          const value1 = import_ObjectUtils.ObjectUtils.Script.evaluateReturn("`" + targetScript + "`", it.pathInfo.obj);
           if (value1 === null) {
-            elementInfo.element.removeAttribute(applyAttributeName.property);
+            elementInfo.element.removeAttribute(it.key);
+            elementInfo.element[it.key] = null;
           } else {
-            elementInfo.element.setAttribute(applyAttributeName.property, value1);
+            elementInfo.element.setAttribute(it.key, value1);
+            elementInfo.element[it.key] = value1;
           }
-        }
-      });
-      Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(import_types.isDefined).flatMap(([key, valueScript]) => {
-        return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
-      }).forEach((info) => {
-        const linkInfo = import_EventManager.EventManager.linkAttrs.find((it) => it.name === info.key);
-        if (linkInfo) {
-          elementInfo.element[linkInfo.property] = value;
-        }
-      });
-    });
+        });
+      }
+    );
+    import_DocumentUtils.DocumentUtils.querySelectorAllByAttributeName(rootElement, import_EventManager.EventManager.linkTargetMapAttrName)?.forEach(
+      (elementInfo) => {
+        const targets = new Map(import_ScriptUtils.ScriptUtils.evaluateReturn(elementInfo.value));
+        Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(import_types.isDefined).flatMap(([key, valueScript]) => {
+          return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
+        }).forEach((info) => {
+          const value1 = import_ScriptUtils.ScriptUtils.evaluateReturn(info.valueScript, info.pathInfo.obj);
+          const applyAttributeName = import_EventManager.EventManager.linkAttrs.find((it) => it.name === info.key);
+          if (applyAttributeName) {
+            if (value1 === null) {
+              elementInfo.element.removeAttribute(applyAttributeName.property);
+            } else {
+              elementInfo.element.setAttribute(applyAttributeName.property, value1);
+            }
+          }
+        });
+        Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(import_types.isDefined).flatMap(([key, valueScript]) => {
+          return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
+        }).forEach((info) => {
+          const linkInfo = import_EventManager.EventManager.linkAttrs.find((it) => it.name === info.key);
+          if (linkInfo) {
+            elementInfo.element[linkInfo.property] = value;
+          }
+        });
+      }
+    );
     if ("onBeforeReturnSet" in receiver && typeof p === "string" && !(this._domRender_config.proxyExcludeOnBeforeReturnSets ?? []).concat(excludeGetSetPropertys).includes(p)) {
       if ((0, import_OnBeforeReturnSet.isOnBeforeReturnSet)(receiver)) {
-        receiver.onBeforeReturnSet?.(p, value, fullPathInfo.map((it) => it.map((it2) => it2.path).join()));
+        receiver.onBeforeReturnSet?.(
+          p,
+          value,
+          fullPathInfo.map((it) => it.map((it2) => it2.path).join())
+        );
       }
     }
     return true;
@@ -385,7 +453,11 @@ class DomRenderProxy {
         it = it._DomRender_origin;
       }
       if ("onBeforeReturnGet" in receiver && typeof p === "string" && !(this._domRender_config.proxyExcludeOnBeforeReturnGets ?? []).concat(excludeGetSetPropertys).includes(p)) {
-        receiver?.onBeforeReturnGet?.(p, it, this.root([[{ path: p, obj: this._domRender_proxy }]], it, false));
+        receiver?.onBeforeReturnGet?.(
+          p,
+          it,
+          this.root([[{ path: p, obj: this._domRender_proxy }]], it, false)
+        );
       }
       return it;
     }
@@ -408,7 +480,7 @@ class DomRenderProxy {
       const isFinal = isObject && DomRenderProxy.isFinal(obj);
       const isFrozen = Object.isFrozen(obj);
       const isShield = obj instanceof import_Types.Shield;
-      if (isNoProxy || isExclude || import_ValidUtils.ValidUtils.isNullOrUndefined(obj) || !isObject || isFinal || isFrozen || isShield) {
+      if (obj === void 0 || obj === null || isNoProxy || isExclude || import_ValidUtils.ValidUtils.isNullOrUndefined(obj) || !isObject || isFinal || isFrozen || isShield) {
         return obj;
       }
     } catch (e) {