@dooboostore/dom-render 1.0.112 → 1.0.114

package/src/events/EventManager.ts

@@ -1,9 +1,9 @@
 import { DomRenderConfig } from '../configs/DomRenderConfig';
-import { ScriptUtils } from '@dooboostore/core-web/script/ScriptUtils';
-import { ElementUtils } from '@dooboostore/core-web/element/ElementUtils';
-import { Range } from '../iterators/Range';
+import { ScriptUtils } from '@dooboostore/core-web';
+import { ElementUtils } from '@dooboostore/core-web';
+import { Range } from '@dooboostore/core';
 import { getDomRenderConfig } from '../DomRenderProxy';
-import { ObjectUtils } from '@dooboostore/core/object/ObjectUtils';
+import { ObjectUtils } from '@dooboostore/core';
 
 type HandlerInfo = {
   element: HTMLElement;
@@ -15,30 +15,27 @@ type HandlerInfo = {
 export type NormalAttrDataType = {
   originalAttrValue: string;
   isStringTemplate: boolean;
-  variablePaths: { origin: string, inner: string }[];
-}
+  variablePaths: { origin: string; inner: string }[];
+};
+
 export class EventManager {
   public static readonly attrPrefix = 'dr-';
-  public readonly eventNames = [
-    'click', 'mousedown', 'mouseup', 'dblclick', 'mouseover', 'mouseout', 'mousemove', 'mouseenter', 'mouseleave', 'contextmenu',
-    'keyup', 'keydown', 'keypress', 'toggle',
-    'change', 'input', 'submit', 'resize', 'focus', 'blur',
-    'close', 'cancel'
-  ];
+  public readonly eventNames = ['click', 'mousedown', 'mouseup', 'dblclick', 'mouseover', 'mouseout', 'mousemove', 'mouseenter', 'mouseleave', 'contextmenu', 'keyup', 'keydown', 'keypress', 'toggle', 'change', 'input', 'submit', 'resize', 'focus', 'blur', 'close', 'cancel', 'scroll'];
 
   private readonly delegatableEventMap: { [key: string]: string } = {
     mouseleave: 'mouseout',
     mouseenter: 'mouseover',
     focus: 'focusin',
-    blur: 'focusout',
+    blur: 'focusout'
   };
-  private readonly directAttachEvents = new Set(['close']);
+  private readonly directAttachEvents = new Set(['close', 'scroll']);
 
   public static ownerVariablePathAttrName = EventManager.attrPrefix + 'owner-variable-path';
 
   public static readonly eventParam = EventManager.attrPrefix + 'event';
   public static readonly onInitAttrName = EventManager.attrPrefix + 'on-init';
   public static readonly valueAttrName = EventManager.attrPrefix + 'value';
+  public static readonly srcAttrName = EventManager.attrPrefix + 'src';
   public static readonly checkedAttrName = EventManager.attrPrefix + 'checked';
   public static readonly selectedAttrName = EventManager.attrPrefix + 'selected';
   public static readonly readonlyAttrName = EventManager.attrPrefix + 'readonly';
@@ -53,8 +50,8 @@ export class EventManager {
     { name: EventManager.attrPrefix + 'hidden-link', property: 'value', event: 'input' },
     { name: EventManager.attrPrefix + 'required-link', property: 'value', event: 'input' },
     { name: EventManager.attrPrefix + 'checked-link', property: 'checked', event: 'change' },
-    { name: EventManager.attrPrefix + 'open-link', property: 'open', event: 'toggle' },
-  ]
+    { name: EventManager.attrPrefix + 'open-link', property: 'open', event: 'toggle' }
+  ];
   // @ts-ignore  합성이벤트(Synthetic) 처리하면서 의미가 없어졌다
   public static readonly linkTargetMapAttrName = EventManager.attrPrefix + 'link-variables';
 
@@ -92,27 +89,10 @@ export class EventManager {
 
   public static readonly WINDOW_EVENT_POPSTATE = 'popstate';
   public static readonly WINDOW_EVENT_RESIZE = 'resize';
-  public static readonly WINDOW_EVENTS = [EventManager.WINDOW_EVENT_POPSTATE, EventManager.WINDOW_EVENT_RESIZE];
-  public static readonly noDetectAttr = [EventManager.normalAttrMapAttrName]
-  public static readonly attrNames = [
-    EventManager.valueAttrName,
-    EventManager.checkedAttrName,
-    EventManager.selectedAttrName,
-    EventManager.readonlyAttrName,
-    EventManager.disabledAttrName,
-    EventManager.hiddenAttrName,
-    EventManager.requiredAttrName,
-    EventManager.openAttrName,
-    EventManager.attrAttrName,
-    EventManager.normalAttrMapAttrName,
-    EventManager.styleAttrName,
-    EventManager.classAttrName,
-    EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_POPSTATE,
-    EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_RESIZE,
-    EventManager.onInitAttrName,
-    ...EventManager.linkAttrs.map(it => it.name),
-    this.eventParam
-  ];
+  public static readonly WINDOW_EVENT_SCROLL = 'scroll';
+  public static readonly WINDOW_EVENTS = [EventManager.WINDOW_EVENT_POPSTATE, EventManager.WINDOW_EVENT_RESIZE, EventManager.WINDOW_EVENT_SCROLL];
+  public static readonly noDetectAttr = [EventManager.normalAttrMapAttrName];
+  public static readonly attrNames = [EventManager.valueAttrName, EventManager.srcAttrName, EventManager.checkedAttrName, EventManager.selectedAttrName, EventManager.readonlyAttrName, EventManager.disabledAttrName, EventManager.hiddenAttrName, EventManager.requiredAttrName, EventManager.openAttrName, EventManager.attrAttrName, EventManager.normalAttrMapAttrName, EventManager.styleAttrName, EventManager.classAttrName, EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_POPSTATE, EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_RESIZE, EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_SCROLL, EventManager.onInitAttrName, ...EventManager.linkAttrs.map(it => it.name), this.eventParam];
   readonly bindScript = `
         const ${EventManager.VALUE_VARNAME} = this.__render.value;
         const ${EventManager.SCRIPTS_VARNAME} = this.__render.scripts;
@@ -133,7 +113,7 @@ export class EventManager {
 
     if (typeof window !== 'undefined') {
       EventManager.WINDOW_EVENTS.forEach(eventName => {
-        window?.addEventListener(eventName, (event) => {
+        window?.addEventListener(eventName, event => {
           const targetAttr = `dr-window-event-${eventName}`;
           document.querySelectorAll(`[${targetAttr}]`).forEach(it => {
             const script = it.getAttribute(targetAttr);
@@ -186,9 +166,7 @@ export class EventManager {
     if (!root) return handlers;
 
     const initialTarget = event.target as Node;
-    let currentTarget: HTMLElement | null = (initialTarget.nodeType === 1)
-      ? (initialTarget as HTMLElement)
-      : initialTarget.parentElement;
+    let currentTarget: HTMLElement | null = initialTarget.nodeType === 1 ? (initialTarget as HTMLElement) : initialTarget.parentElement;
     const collectedElements = new Set<HTMLElement>();
 
     const eventMap: { [key: string]: string } = {
@@ -231,7 +209,13 @@ export class EventManager {
       const eventParamAttr = EventManager.eventParam;
       if (currentTarget.hasAttribute(eventParamAttr)) {
         const bindEvents = currentTarget.getAttribute(`${eventParamAttr}:bind`);
-        if (bindEvents && bindEvents.split(',').map(s => s.trim()).includes(mappedEventName)) {
+        if (
+          bindEvents &&
+          bindEvents
+            .split(',')
+            .map(s => s.trim())
+            .includes(mappedEventName)
+        ) {
           handlers.push({
             element: currentTarget,
             attr: eventParamAttr,
@@ -366,9 +350,11 @@ export class EventManager {
         const attributes = ElementUtils.getAttributeToObject(element);
         const params = {} as any;
         const prefix = attr + ':';
-        Object.entries(attributes).filter(([k, v]) => k.startsWith(prefix)).forEach(([k, v]) => {
-          params[k.slice(prefix.length)] = v;
-        });
+        Object.entries(attributes)
+          .filter(([k, v]) => k.startsWith(prefix))
+          .forEach(([k, v]) => {
+            params[k.slice(prefix.length)] = v;
+          });
 
         const paramContext = this.createExecutionContext(event, element, componentInstance, config, { params });
         ScriptUtils.evaluate(`${this.getBindScript(config)} ${paramScript}`, paramContext);
@@ -406,6 +392,15 @@ export class EventManager {
         }
       }
     });
+    this.procAttr<HTMLInputElement>(childNodes, EventManager.srcAttrName, (it, attribute) => {
+      const script = attribute;
+      if (script) {
+        const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (it.src !== data) {
+          it.src = data;
+        }
+      }
+    });
     // console.log('applyEvent value time', performance.now() - t0);
     // t0 = performance.now();
     this.procAttr<HTMLInputElement>(childNodes, EventManager.checkedAttrName, (it, attribute) => {
@@ -423,6 +418,11 @@ export class EventManager {
       const script = attribute;
       if (script) {
         const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (data) {
+          it.setAttribute('selected', 'selected');
+        } else {
+          it.removeAttribute('selected');
+        }
         if (it.selected !== data) {
           it.selected = data;
         }
@@ -434,6 +434,11 @@ export class EventManager {
       const script = attribute;
       if (script) {
         const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (data) {
+          it.setAttribute('readonly', 'readonly');
+        } else {
+          it.removeAttribute('readonly');
+        }
         if (it.readOnly !== data) {
           it.readOnly = data;
         }
@@ -445,6 +450,11 @@ export class EventManager {
       const script = attribute;
       if (script) {
         const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (data) {
+          it.setAttribute('disabled', 'disabled');
+        } else {
+          it.removeAttribute('disabled');
+        }
         if (it.disabled !== data) {
           it.disabled = data;
         }
@@ -456,6 +466,11 @@ export class EventManager {
       const script = attribute;
       if (script) {
         const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (data) {
+          it.setAttribute('hidden', 'hidden');
+        } else {
+          it.removeAttribute('hidden');
+        }
         if (it.hidden !== data) {
           it.hidden = data;
         }
@@ -467,6 +482,11 @@ export class EventManager {
       const script = attribute;
       if (script) {
         const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (data) {
+          it.setAttribute('required', 'required');
+        } else {
+          it.removeAttribute('required');
+        }
         if (it.required !== data) {
           it.required = data;
         }
@@ -478,6 +498,11 @@ export class EventManager {
       const script = attribute;
       if (script) {
         const data = ObjectUtils.Script.evaluateReturn(script, obj);
+        if (data) {
+          it.setAttribute('open', 'open');
+        } else {
+          it.removeAttribute('open');
+        }
         if (it.open !== data) {
           it.open = data;
         }
@@ -488,29 +513,31 @@ export class EventManager {
     this.procAttr(childNodes, EventManager.normalAttrMapAttrName, (it, attribute) => {
       const map = new Map<string, NormalAttrDataType>(JSON.parse(attribute));
       map.forEach((v, k) => {
-
         const variablePaths = v.variablePaths;
-        let targetScript = v.originalAttrValue;//typeof v.originalAttrValue === 'string' ? JSON.parse(v.originalAttrValue) : v.originalAttrValue;
+        let targetScript = v.originalAttrValue; //typeof v.originalAttrValue === 'string' ? JSON.parse(v.originalAttrValue) : v.originalAttrValue;
         let script: string;
         if (v.isStringTemplate) {
           variablePaths.forEach(it => {
             let r = ObjectUtils.Path.toOptionalChainPath(it.inner);
             targetScript = targetScript.replaceAll(it.origin, `\${${r}}`);
-          })
+          });
           script = '`' + targetScript + '`';
         } else {
           variablePaths.forEach(it => {
             let r = ObjectUtils.Path.toOptionalChainPath(it.inner);
             targetScript = targetScript.replaceAll(it.origin, `${r}`);
-          })
+          });
           script = targetScript;
         }
-        const data = ObjectUtils.Script.evaluate(`const $element = this.element;  return ${script}`, Object.assign(obj, {
-          __render: Object.freeze({
-            element: it,
-            attribute: ElementUtils.getAttributeToObject(it)
+        const data = ObjectUtils.Script.evaluate(
+          `const $element = this.element;  return ${script}`,
+          Object.assign(obj, {
+            __render: Object.freeze({
+              element: it,
+              attribute: ElementUtils.getAttributeToObject(it)
+            })
           })
-        }));
+        );
         // console.log('!!!!!!!!!!!', k, data, script, variablePaths, v)
         if (data === null || data === undefined) {
           it.removeAttribute(k);
@@ -592,20 +619,25 @@ export class EventManager {
         script = 'return ' + script;
       }
       if (script) {
-        ObjectUtils.Script.evaluate(`${this.getBindScript(config)}; ${script} `, Object.assign(obj, {
-          __render: Object.freeze({
-            element: it,
-            attribute: ElementUtils.getAttributeToObject(it),
-            ...config?.eventVariables
+        ObjectUtils.Script.evaluate(
+          `${this.getBindScript(config)}; ${script} `,
+          Object.assign(obj, {
+            __render: Object.freeze({
+              element: it,
+              attribute: ElementUtils.getAttributeToObject(it),
+              ...config?.eventVariables
+            })
           })
-        }));
+        );
       }
     });
     // console.log('applyEvent value time', performance.now() - t0);
     // t0 = performance.now();
     this.onRenderedEvent(obj, childNodes, config);
     this.changeVar(obj, childNodes, undefined, config);
-    const elements = Array.from(childNodes).filter(it => it.nodeType === 1).map(it => it as Element);
+    const elements = Array.from(childNodes)
+      .filter(it => it.nodeType === 1)
+      .map(it => it as Element);
     elements.forEach(it => {
       config?.applyEvents?.filter(ta => it.getAttribute(ta.attrName) !== null).forEach(ta => ta.callBack(it, it.getAttribute(ta.attrName)!, obj));
     });
@@ -621,18 +653,23 @@ export class EventManager {
         script = 'return ' + script;
       }
       if (script) {
-        ObjectUtils.Script.evaluate(`${this.getBindScript(config)}; ${script} `, Object.assign(obj, {
-          __render: Object.freeze({
-            element: it,
-            attribute: ElementUtils.getAttributeToObject(it),
-            ...config?.eventVariables
+        ObjectUtils.Script.evaluate(
+          `${this.getBindScript(config)}; ${script} `,
+          Object.assign(obj, {
+            __render: Object.freeze({
+              element: it,
+              attribute: ElementUtils.getAttributeToObject(it),
+              ...config?.eventVariables
+            })
           })
-        }));
+        );
       }
     });
   }
 
   public changeVar(obj: any, elements: Set<Element> | Set<ChildNode>, varName?: string, config?: DomRenderConfig) {
+    // 아래 이부분을 적용해야될지 말아야될지....성능이슈가.. 그래서 우선 timeout으로 테스크큐로.. 우선..
+
     // console.log('changeVar', obj, elements, varName)
     this.procAttr(elements, EventManager.styleAttrName, (it: HTMLElement, attribute) => {
       let script = attribute;
@@ -640,19 +677,22 @@ export class EventManager {
         script = 'return ' + script;
       }
       if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
-        const data = ObjectUtils.Script.evaluate(`const $element = this.__render.element;  ${script} `, Object.assign(obj, {
-          __render: Object.freeze({
-            element: it,
-            attribute: ElementUtils.getAttributeToObject(it)
+        const data = ObjectUtils.Script.evaluate(
+          `const $element = this.__render.element;  ${script} `,
+          Object.assign(obj, {
+            __render: Object.freeze({
+              element: it,
+              attribute: ElementUtils.getAttributeToObject(it)
+            })
           })
-        }));
+        );
         if (typeof data === 'string') {
           data.split(';').forEach(sit => {
             const [key, value] = sit.split(':').map(s => s.trim());
             if (key && value) {
               (it.style as any)[key] = value;
             }
-          })
+          });
           // it.setAttribute('style', data);
         } else if (Array.isArray(data)) {
           data.forEach(sit => {
@@ -660,10 +700,10 @@ export class EventManager {
             if (key && value) {
               (it.style as any)[key] = value;
             }
-          })
+          });
 
           // it.setAttribute('style', data.join(';'));
-        } else {
+        } else if (data) {
           for (const [key, value] of Object.entries(data)) {
             // if (it instanceof HTMLElement) {
             (it.style as any)[key] = value === null ? null : String(value);
@@ -679,25 +719,36 @@ export class EventManager {
         script = 'return ' + script;
       }
       if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
-        const data = ObjectUtils.Script.evaluate(`const $element = this.element;  ${script} `, Object.assign(obj, {
-          __render: Object.freeze({
-            element: it,
-            attribute: ElementUtils.getAttributeToObject(it)
+        const data = ObjectUtils.Script.evaluate(
+          `const $element = this.element;  ${script} `,
+          Object.assign(obj, {
+            __render: Object.freeze({
+              element: it,
+              attribute: ElementUtils.getAttributeToObject(it)
+            })
           })
-        }));
+        );
 
         // alert(1)
         if (typeof data === 'string') {
-          data.split(' ').forEach(cit => it.classList.add(cit.trim()));
+          data
+            .split(' ')
+            .map(it => it.trim())
+            .filter(it => it.length > 0)
+            .forEach(cit => it.classList.add(cit.trim()));
         } else if (Array.isArray(data)) {
-          data.forEach(cit => it.classList.add(cit.trim()));
-        } else {
+          data
+            .map(it => it.trim())
+            .filter(it => it.length > 0)
+            .forEach(cit => it.classList.add(cit.trim()));
+        } else if (data) {
           for (const [key, value] of Object.entries(data)) {
             if (it instanceof HTMLElement) {
-              if (value) {
-                it.classList.add(key.trim());
-              } else {
-                it.classList.remove(key.trim());
+              const v = key.trim();
+              if (value && v) {
+                it.classList.add(v);
+              } else if (v) {
+                it.classList.remove(v);
               }
             }
           }
@@ -762,7 +813,7 @@ export class EventManager {
     });
   }
 
-  public procAttr<T extends Element = Element>(elements: Set<Element> | Set<ChildNode> | Node[] = new Set(), attrName: string, callBack: (h: T, value: string, attributes: any) => void) {
+  public deepAttributeElements(elements: Set<Element> | Set<ChildNode> | Node[] = new Set(), attrName: string): Set<Element> {
     const sets = new Set<Element>();
     elements.forEach(it => {
       if (!it) {
@@ -770,17 +821,26 @@ export class EventManager {
       }
       if (it.nodeType === 1) {
         const e = it as Element;
-        sets.add(e);
-        e.querySelectorAll<T>(`[${attrName}]`).forEach(it => {
+        if (e.hasAttribute(attrName)) {
+          sets.add(e);
+        }
+        e.querySelectorAll<Element>(`[${attrName}]`).forEach(it => {
           sets.add(it);
         });
       }
     });
+    return sets;
+  }
+
+  public procAttr<T extends Element = Element>(elements: Set<Element> | Set<ChildNode> | Node[] = new Set(), attrName: string, callBack: (h: T, value: string, attributes: any) => void) {
+    const sets = this.deepAttributeElements(elements, attrName);
     sets.forEach(it => {
       const attr = it.getAttribute(attrName);
       const attrs = ElementUtils.getAttributeToObject(it);
       if (attr) {
+        // setTimeout(() => {
         callBack(it as T, attr, attrs);
+        // }, 0)
       }
     });
   }
@@ -795,23 +855,31 @@ export class EventManager {
 
   public setValue(obj: any, name: string, value?: any) {
     name = name.replaceAll('this.', 'this.this.');
-    ScriptUtils.evaluate(`${name} = this.value;`, {
+    ObjectUtils.Script.evaluate(`${name} = this.value;`, {
       this: obj,
       value: value
     });
   }
 
-  public static isUsingThisVar(raws: string | null | undefined, varName: string | null | undefined): boolean {
-    if (varName && raws) {
-      if (varName.startsWith('this.')) {
-        varName = varName.replace(/this\./, '');
-      }
+  public static decodeScriptVar(raws: string | null | undefined): string | undefined {
+    if (raws) {
       // TODO: 훔.. 꼭필요한가..?  트리거될때 스크립트변수 까지 감지해야될까?
       EventManager.VARNAMES.forEach(it => {
         // raws = raws!.replace(RegExp(it.replace('$', '\\$'), 'g'), `this?.___${it}`);
         raws = raws!.replace(RegExp(it.replace('$', '\\$'), 'g'), `this.___${it}`);
       });
-      const variablePaths = ObjectUtils.Path.detectPathFromScript(raws ?? '', { excludeThis: true });
+      return raws;
+    }
+    return undefined;
+  }
+
+  public static isUsingThisVar(raws: string | null | undefined, varName: string | null | undefined): boolean {
+    raws = EventManager.decodeScriptVar(raws);
+    if (varName && raws) {
+      if (varName.startsWith('this.')) {
+        varName = varName.replace(/this\./, '');
+      }
+      const variablePaths = ObjectUtils.Path.detectPathFromScript(raws, { excludeThis: true });
       return variablePaths.has(varName);
     }
     return false;
@@ -831,13 +899,15 @@ export class EventManager {
 
   getBindScript(config?: DomRenderConfig) {
     if (config?.eventVariables) {
-      const bindScript = Object.entries(config.eventVariables).filter(([key, value]) => !this.bindScript.includes(`const ${key}`)).map(([key, value]) => {
-        return `const ${key} = this.__render.${key};`;
-      }).join(';');
+      const bindScript = Object.entries(config.eventVariables)
+        .filter(([key, value]) => !this.bindScript.includes(`const ${key}`))
+        .map(([key, value]) => {
+          return `const ${key} = this.__render.${key};`;
+        })
+        .join(';');
       return this.bindScript + '' + bindScript;
     } else {
       return this.bindScript;
     }
   }
 }
-

package/src/index.ts

@@ -1,17 +1,33 @@
-//
-// export * from './components';
-// export * from './configs';
-// export * from './decorators';
-// export * from './events';
-// export * from './iterators';
-// export * from './lifecycle';
-// export * from './messenger';
-// // export * from './operators';
-// export { Appender as AppenderArray, Dr, DrAppender, DrFor, DrForOf, DrForm, DrIf, DrInnerHTML, DrInnerText, DrPre, DrRepeat, DrStripElement, DrTargetAttr, DrTargetElement, DrTargetElementIsElement, DrThis, DrThisProperty, OperatorExecuter, OperatorExecuterAttrRequire } from './operators';
-// export * from './rawsets';
-// export * from './routers';
-// export * from './types';
-// export * from './validators';
-// export * from './DomRender';
-// export * from './DomRenderProxy';
-export default {}
+export {
+	drComponent,
+	If,
+	This,
+	Appender as AppenderComponent,
+	PromiseSwitch,
+	Choose,
+	CheckBox,
+	Radio,
+	Select,
+	Timer,
+	Details,
+	Input,
+	Route,
+	RouterOutlet,
+	A,
+	ComponentSet,
+	ComponentRouterBase,
+	attribute,
+	ComponentBase
+} from './components';
+export type { ComponentBaseConfig, ChildrenSet, ComponentRouterBaseConfig } from './components';
+export * from './configs';
+export * from './decorators';
+export * from './events';
+export * from './lifecycle';
+export * from './messenger';
+export * from './operators';
+export * from './rawsets';
+export * from './types';
+export * from './DomRender';
+export * from './DomRenderProxy';
+export default {};

package/src/messenger/Messenger.ts

@@ -1,4 +1,4 @@
-import { ConstructorType } from '@dooboostore/core/types';
+import { ConstructorType } from '@dooboostore/core';
 import {DomRenderFinalProxy} from '../types/Types';
 import {DomRenderConfig} from '../configs/DomRenderConfig';
 

package/src/operators/Dr.ts

@@ -1,9 +1,8 @@
 import {OperatorExecuterAttrRequire} from './OperatorExecuterAttrRequire';
-import {ScriptUtils} from '@dooboostore/core-web/script/ScriptUtils';
 import {RawSet} from '../rawsets/RawSet';
 import {Render} from '../rawsets/Render';
 import {AfterCallBack, ElementSource, ExecuteState, ReturnContainer, Source} from './OperatorExecuter';
-import {ObjectUtils} from "@dooboostore/core/object/ObjectUtils";
+import {ObjectUtils} from "@dooboostore/core";
 
 export class Dr extends OperatorExecuterAttrRequire<null> {
     constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack) {