@dooboostore/simple-web-component 1.0.38 → 1.0.40

package/dist/esm/decorators/applySlot.js

@@ -3,108 +3,119 @@ import { ensureInit, getElementConfig } from "./elementDefine.js";
 import { SwcUtils } from "../utils/Utils.js";
 import { NodeSlot } from "@dooboostore/core-web";
 const APPLY_SLOT_METADATA_KEY = Symbol.for("simple-web-component:apply-slot");
-function applySlot(id, options = { position: "replaceChildrenHtml" }) {
+const applyToDom = (swcId, id, pos, nodes) => {
+  const nodeSlot = new NodeSlot(void 0, swcId);
+  if (pos === "replaceChildrenText" || pos === "replaceChildren" || pos === "replaceChildrenHtml") {
+    nodeSlot.replaceChildren(id, ...nodes);
+  } else if (pos === "appendHtml" || pos === "append" || pos === "appendText") {
+    nodeSlot.append(id, ...nodes);
+  } else if (pos === "prependHtml" || pos === "prepend" || pos === "prependText") {
+    nodeSlot.prepend(id, ...nodes);
+  } else if (pos === "clear") {
+    nodeSlot.clear(id);
+  }
+};
+function applySlot(targetId, opt) {
   return (targetObj, propertyKey, descriptor) => {
-    const type = descriptor === void 0 ? "property" : "method";
-    if (type === "property") {
-      Object.defineProperty(targetObj, propertyKey, {
-        get() {
-          const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);
-          return nodeSlot;
-        },
-        set(nv) {
-          if (nv) {
-          } else {
-            const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);
-            nodeSlot.clear();
-          }
-        },
-        configurable: true,
-        enumerable: true
-      });
-    }
+    const options = { position: "replaceChildren", ...opt };
     const constructor = targetObj.constructor;
     let metaList = ReflectUtils.getOwnMetadata(APPLY_SLOT_METADATA_KEY, constructor);
     if (!metaList) {
       metaList = [];
       ReflectUtils.defineMetadata(APPLY_SLOT_METADATA_KEY, metaList, constructor);
     }
-    metaList.push({ propertyKey, id, type, options });
-    if (type === "method") {
-      const original = descriptor.value;
-      descriptor.value = function(...args) {
-        ensureInit(this);
-        const conf = getElementConfig(this);
-        const currentWin = this._resolveWindow?.(conf) || (typeof window !== "undefined" ? window : void 0);
-        const currentDoc = currentWin.document;
-        const hostSet = SwcUtils.getHelperAndHostSet(currentWin, this);
-        let res = original.apply(this, args);
-        if (res) {
-          const nodeSlot = new NodeSlot(this, this._swcId);
-          const pos = options.position || "replaceChildrenHtml";
-          const doc = currentWin.document;
-          if (pos === "replaceChildrenHtml") {
-            nodeSlot.replaceChildrenHtml(id, res);
-          } else if (pos === "replaceChildrenText") {
-            nodeSlot.replaceChildrenText(id, res);
-          } else if (pos === "appendHtml") {
-            nodeSlot.appendHtml(id, res);
-          } else if (pos === "appendText") {
-            nodeSlot.appendText(id, res);
-          } else if (pos === "prependHtml") {
-            nodeSlot.prependHtml(id, res);
-          } else if (pos === "prependText") {
-            nodeSlot.prependText(id, res);
-          } else if (pos === "clear") {
-            nodeSlot.clear(id);
-          }
+    metaList.push({ propertyKey, targetId, options });
+    const original = descriptor.value;
+    descriptor.value = function(...args) {
+      ensureInit(this);
+      const conf = getElementConfig(this);
+      const currentWin = conf.window;
+      const swcId = this._swcId;
+      const currentDoc = currentWin.document;
+      const hostSet = SwcUtils.getHelperAndHostSet(currentWin, this);
+      const pos = options.position;
+      const resToNodes = (res2) => {
+        const nodes = [];
+        if (typeof res2 === "string" && (pos === "replaceChildrenHtml" || pos === "appendHtml" || pos === "prependHtml")) {
+          const t = currentWin.document.createElement("template");
+          t.innerHTML = res2;
+          nodes.push(...Array.from(t.content.childNodes));
+        } else if (typeof res2 === "string" && (pos === "replaceChildrenText" || pos === "prependText" || pos === "appendText")) {
+          nodes.push(currentWin.document.createTextNode(res2));
+        } else if (typeof res2 === "object") {
+          nodes.push(res2);
         }
-        return res;
+        SwcUtils.projectProcessHtml(swcId, nodes, currentDoc);
+        return nodes;
       };
-    }
+      const fallbackNodes = [];
+      if (options.fallback) {
+        const res2 = options.fallback.call(this, hostSet);
+        const nodes = resToNodes(res2);
+        fallbackNodes.push(...nodes);
+        applyToDom(swcId, targetId, options.position, nodes);
+      }
+      let res = original.apply(this, args);
+      if (res instanceof Promise) {
+        return res.then((asyncRes) => {
+          const nodes = resToNodes(asyncRes);
+          fallbackNodes.forEach((it) => it.remove());
+          applyToDom(swcId, targetId, options.position, nodes);
+        });
+      } else {
+        const nodes = resToNodes(res);
+        applyToDom(swcId, targetId, options.position, nodes);
+      }
+    };
   };
 }
-const findAllApplySlotMetadata = (target) => {
-  const constructor = target instanceof Function ? target : target.constructor;
-  return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);
-};
-function applySlotClear(id) {
-  return applySlot(id, { position: "clear" });
+function clearSlot(targetId) {
+  return applySlot(targetId, { position: "clear" });
 }
-function applySlotPrependHtml(id) {
-  return applySlot(id, { position: "prependHtml" });
+function prependHtmlSlot(targetId) {
+  return applySlot(targetId, { position: "prependHtml" });
 }
-const applySlotPrepend = applySlotPrependHtml;
-function applySlotPrependText(id) {
-  return applySlot(id, { position: "prependText" });
+function prependSlot(targetId) {
+  return applySlot(targetId, { position: "prepend" });
 }
-function applySlotAppendHtml(id) {
-  return applySlot(id, { position: "appendHtml" });
+function prependTextSlot(targetId) {
+  return applySlot(targetId, { position: "prependText" });
 }
-function applySlotAppendText(id) {
-  return applySlot(id, { position: "appendText" });
+function appendHtmlSlot(targetId) {
+  return applySlot(targetId, { position: "appendHtml" });
 }
-const applySlotAppend = applySlotAppendHtml;
-function applySlotReplaceChildrenHtml(id) {
-  return applySlot(id, { position: "replaceChildrenHtml" });
+function appendTextSlot(targetId) {
+  return applySlot(targetId, { position: "appendText" });
 }
-const applySlotReplaceChildren = applySlotReplaceChildrenHtml;
-function applySlotReplaceChildrenText(id) {
-  return applySlot(id, { position: "replaceChildrenText" });
+function appendSlot(targetId) {
+  return applySlot(targetId, { position: "append" });
 }
+function replaceChildrenHtmlSlot(targetId) {
+  return applySlot(targetId, { position: "replaceChildrenHtml" });
+}
+function replaceChildrenSlot(targetId) {
+  return applySlot(targetId, { position: "replaceChildren" });
+}
+function replaceChildrenTextSlot(targetId) {
+  return applySlot(targetId, { position: "replaceChildrenText" });
+}
+const findAllApplySlotMetadata = (target) => {
+  const constructor = target instanceof Function ? target : target.constructor;
+  return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);
+};
 export {
   APPLY_SLOT_METADATA_KEY,
+  appendHtmlSlot,
+  appendSlot,
+  appendTextSlot,
   applySlot,
-  applySlotAppend,
-  applySlotAppendHtml,
-  applySlotAppendText,
-  applySlotClear,
-  applySlotPrepend,
-  applySlotPrependHtml,
-  applySlotPrependText,
-  applySlotReplaceChildren,
-  applySlotReplaceChildrenHtml,
-  applySlotReplaceChildrenText,
-  findAllApplySlotMetadata
+  clearSlot,
+  findAllApplySlotMetadata,
+  prependHtmlSlot,
+  prependSlot,
+  prependTextSlot,
+  replaceChildrenHtmlSlot,
+  replaceChildrenSlot,
+  replaceChildrenTextSlot
 };
 //# sourceMappingURL=applySlot.js.map

package/dist/esm/decorators/applySlot.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/decorators/applySlot.ts"],
-  "sourcesContent": ["import {ReflectUtils} from '@dooboostore/core';\nimport {ensureInit, getElementConfig} from './elementDefine';\nimport {SwcUtils} from \"../utils/Utils\";\nimport {NodeSlot} from \"@dooboostore/core-web\";\n/*\n<!-- beforebegin -->\n<p> <-- it's me\n  <!-- afterbegin -->\n  foo\n  <!-- beforeend -->\n</p>\n<!-- afterend -->\n */\nexport type ApplySlotPosition = 'prependHtml' | 'prependText' | 'appendHtml' | 'appendText' | 'replaceChildrenHtml' | 'replaceChildrenText' | 'clear';\n\nexport interface ApplySlotOptions {\n  position?: ApplySlotPosition;\n  // root?: SwcRootType;\n  /**\n   * Filter function to determine whether to perform DOM operation.\n   * If it returns false, the operation is skipped.\n   */\n  // filter?: (target: HTMLElement | ShadowRoot, newValue: any, meta:{currentThis: any,helper: HelperHostSet}) => boolean;\n  /**\n   * Optional loading content to display while an async method is executing.\n   */\n  // loading?: (helper: HelperHostSet) => any;\n}\n\nexport interface ApplySlotMetadata {\n  propertyKey: string | symbol;\n  id: string;\n  type: 'method' | 'property';\n  options: ApplySlotOptions;\n}\n\nexport const APPLY_SLOT_METADATA_KEY = Symbol.for('simple-web-component:apply-slot');\n\n// const normalizeNodes = (res: any, doc: Document): Node[] => {\n//   const items = Array.isArray(res) ? res : [res];\n//   return items.map(it => {\n//     if (it instanceof Node) return it;\n//     return doc.createTextNode(it !== undefined && it !== null ? String(it) : '');\n//   });\n// };\n\n// const applyToDom = (targetEl: any, res: any, pos: ApplyNodePosition, win: Window) => {\n//     if (!targetEl) return;\n//\n//     const doc = win.document;\n//\n//     if (pos === 'innerHtml') {\n//         targetEl.innerHTML = res !== undefined && res !== null ? String(res) : '';\n//         return;\n//     }\n//\n//     if (pos === 'innerText') {\n//         if (targetEl.innerText !== undefined) {\n//             targetEl.innerText = res !== undefined && res !== null ? String(res) : '';\n//         }\n//         return;\n//     }\n//\n//     const isShadowRoot = targetEl instanceof win.ShadowRoot;\n//     const nodes = normalizeNodes(res, doc);\n//     if (pos === 'replace') {\n//       if (!isShadowRoot) targetEl.replaceWith(...nodes);\n//     } else if (pos === 'replaceChildren') {\n//       targetEl.replaceChildren(...nodes);\n//     } else {\n//       if (pos === 'beforeEnd') targetEl.append(...nodes);\n//       else if (pos === 'afterBegin') targetEl.prepend(...nodes);\n//       else if (pos === 'beforeBegin' && !isShadowRoot) targetEl.before(...nodes);\n//       else if (pos === 'afterEnd' && !isShadowRoot) targetEl.after(...nodes);\n//     }\n// };\n\n/**\n * @applyNode decorator to surgically add/replace nodes to a target element.\n */\nexport function applySlot(id: string, options: ApplySlotOptions = { position: 'replaceChildrenHtml' }): MethodDecorator & PropertyDecorator {\n  return (targetObj: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor) => {\n    const type = descriptor === undefined ? 'property' : 'method';\n\n    if (type === 'property') {\n            Object.defineProperty(targetObj, propertyKey, {\n              get(this: any) {\n                const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);\n                return nodeSlot;\n              },\n              set(this: any, nv: any) {\n                if(nv) {\n                  // \uC788\uC744\uB54C \uC544\uBB34\uC77C\uB3C4\uC548\uD568\n                } else {\n                  const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);\n                  nodeSlot.clear();\n                }\n              },\n              configurable: true,\n              enumerable: true,\n            })\n     // return nodeSlot;\n     //  return;\n    }\n\n    const constructor = targetObj.constructor;\n    let metaList = ReflectUtils.getOwnMetadata(APPLY_SLOT_METADATA_KEY, constructor) as ApplySlotMetadata[];\n    if (!metaList) {\n      metaList = []\n      ReflectUtils.defineMetadata(APPLY_SLOT_METADATA_KEY, metaList, constructor);\n    }\n    metaList.push({ propertyKey, id, type, options });\n\n\n\n    if (type === 'method') {\n      const original = descriptor.value;\n      descriptor.value = function (...args: any[]) {\n        ensureInit(this);\n\n        const conf = getElementConfig(this);\n        const currentWin = (this as any)._resolveWindow?.(conf) || ((typeof window !== 'undefined' ? window : undefined) as Window);\n        const currentDoc = currentWin.document;\n        const hostSet = SwcUtils.getHelperAndHostSet(currentWin, this);\n        let res = original.apply(this, args);\n        if (res) {\n          // res = SwcUtils.projectProcessHtml(this, res)\n          const nodeSlot = new NodeSlot(this, this._swcId);\n          const pos = options.position || 'replaceChildrenHtml';\n          const doc = currentWin.document;\n          if (pos === 'replaceChildrenHtml') {\n            nodeSlot.replaceChildrenHtml(id, res);\n          } else if (pos === 'replaceChildrenText') {\n            nodeSlot.replaceChildrenText(id, res);\n          } else if (pos === 'appendHtml') {\n            nodeSlot.appendHtml(id, res);\n          } else if (pos === 'appendText') {\n            nodeSlot.appendText(id, res);\n          } else if (pos === 'prependHtml') {\n            nodeSlot.prependHtml(id, res);\n          } else if (pos === 'prependText') {\n            nodeSlot.prependText(id, res);\n          } else if (pos === 'clear') {\n            nodeSlot.clear(id);\n          }\n\n          // const stateContext: any = {...hostSet};\n          // getStateMetadata(this).forEach(it => {\n          //   stateContext[it.name] = this[it.propertyKey]\n          // })\n          // new ElementApply(this, {id: this._swcId}).apply({target:'noInitialized', context: stateContext, bind: this});\n        }\n        return res;\n      };\n    }\n  };\n}\n\n// export const findAllApplySlotMetadata = (target: any): Map<string | symbol, ApplySlotMetadata> => {\nexport const findAllApplySlotMetadata = (target: any): ApplySlotMetadata[] => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);\n};\n\nexport function applySlotClear(id: string): MethodDecorator {\n  return applySlot(id, { position: 'clear' });\n}\nexport function applySlotPrependHtml(id: string): MethodDecorator {\n  return applySlot(id, { position: 'prependHtml' });\n}\nexport const applySlotPrepend = applySlotPrependHtml;\nexport function applySlotPrependText(id: string): MethodDecorator {\n  return applySlot(id, { position: 'prependText' });\n}\nexport function applySlotAppendHtml(id: string): MethodDecorator {\n  return applySlot(id, { position: 'appendHtml' });\n}\nexport function applySlotAppendText(id: string): MethodDecorator {\n  return applySlot(id, { position: 'appendText' });\n}\nexport const applySlotAppend = applySlotAppendHtml;\nexport function applySlotReplaceChildrenHtml(id: string): MethodDecorator {\n  return applySlot(id, { position: 'replaceChildrenHtml' });\n}\nexport const applySlotReplaceChildren = applySlotReplaceChildrenHtml;\nexport function applySlotReplaceChildrenText(id: string): MethodDecorator {\n  return applySlot(id, { position: 'replaceChildrenText' });\n}\n"],
-  "mappings": "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",
-  "names": []
+  "sourcesContent": ["import {OptionalType, ReflectUtils} from '@dooboostore/core';\nimport {ensureInit, getElementConfig} from './elementDefine';\nimport {SwcUtils} from \"../utils/Utils\";\nimport {NodeSlot} from \"@dooboostore/core-web\";\nimport {HelperHostSet} from \"../types\";\n/*\n<!-- beforebegin -->\n<p> <-- it's me\n  <!-- afterbegin -->\n  foo\n  <!-- beforeend -->\n</p>\n<!-- afterend -->\n */\nexport type ApplySlotPosition = 'prepend' | 'prependHtml' | 'prependText' | 'append' | 'appendHtml' | 'appendText' | 'replaceChildren' | 'replaceChildrenHtml' | 'replaceChildrenText' | 'clear';\n\nexport interface ApplySlotOptions {\n  position: ApplySlotPosition;\n  fallback?: (helper: HelperHostSet) => string | Node;\n  // root?: SwcRootType;\n  /**\n   * Filter function to determine whether to perform DOM operation.\n   * If it returns false, the operation is skipped.\n   */\n  // filter?: (target: HTMLElement | ShadowRoot, newValue: any, meta:{currentThis: any,helper: HelperHostSet}) => boolean;\n  /**\n   * Optional loading content to display while an async method is executing.\n   */\n  // loading?: (helper: HelperHostSet) => any;\n}\n\nexport interface ApplySlotMetadata {\n  propertyKey: string | symbol;\n  targetId: string;\n  // type: 'method' | 'property';\n  options: ApplySlotOptions;\n}\n\nexport const APPLY_SLOT_METADATA_KEY = Symbol.for('simple-web-component:apply-slot');\n\n// const normalizeNodes = (res: any, doc: Document): Node[] => {\n//   const items = Array.isArray(res) ? res : [res];\n//   return items.map(it => {\n//     if (it instanceof Node) return it;\n//     return doc.createTextNode(it !== undefined && it !== null ? String(it) : '');\n//   });\n// };\n\n// const applyToDom = (targetEl: any, res: any, pos: ApplyNodePosition, win: Window) => {\n//     if (!targetEl) return;\n//\n//     const doc = win.document;\n//\n//     if (pos === 'innerHtml') {\n//         targetEl.innerHTML = res !== undefined && res !== null ? String(res) : '';\n//         return;\n//     }\n//\n//     if (pos === 'innerText') {\n//         if (targetEl.innerText !== undefined) {\n//             targetEl.innerText = res !== undefined && res !== null ? String(res) : '';\n//         }\n//         return;\n//     }\n//\n//     const isShadowRoot = targetEl instanceof win.ShadowRoot;\n//     const nodes = normalizeNodes(res, doc);\n//     if (pos === 'replace') {\n//       if (!isShadowRoot) targetEl.replaceWith(...nodes);\n//     } else if (pos === 'replaceChildren') {\n//       targetEl.replaceChildren(...nodes);\n//     } else {\n//       if (pos === 'beforeEnd') targetEl.append(...nodes);\n//       else if (pos === 'afterBegin') targetEl.prepend(...nodes);\n//       else if (pos === 'beforeBegin' && !isShadowRoot) targetEl.before(...nodes);\n//       else if (pos === 'afterEnd' && !isShadowRoot) targetEl.after(...nodes);\n//     }\n// };\n\nconst applyToDom = (swcId: string, id: string, pos: ApplySlotPosition, nodes: Node[]) => {\n  const nodeSlot = new NodeSlot(this, swcId);\n  if (pos === 'replaceChildrenText' || pos === 'replaceChildren' || pos === 'replaceChildrenHtml') {\n    nodeSlot.replaceChildren(id, ...nodes);\n  } else if (pos === 'appendHtml' || pos === 'append' || pos === 'appendText') {\n    nodeSlot.append(id, ...nodes);\n  } else if (pos === 'prependHtml' || pos === 'prepend' || pos === 'prependText') {\n    nodeSlot.prepend(id, ...nodes);\n  } else if (pos === 'clear') {\n    nodeSlot.clear(id);\n  }\n}\n\n/**\n * @applyNode decorator to surgically add/replace nodes to a target element.\n */\nexport function applySlot(targetId: string, opt: OptionalType<ApplySlotOptions, 'position'>): MethodDecorator {\n  return (targetObj: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => {\n\n\n    const options: ApplySlotOptions = {position: 'replaceChildren', ...opt};\n\n\n    const constructor = targetObj.constructor;\n    let metaList = ReflectUtils.getOwnMetadata(APPLY_SLOT_METADATA_KEY, constructor) as ApplySlotMetadata[];\n    if (!metaList) {\n      metaList = []\n      ReflectUtils.defineMetadata(APPLY_SLOT_METADATA_KEY, metaList, constructor);\n    }\n    metaList.push({propertyKey, targetId, options});\n\n\n    const original = descriptor.value;\n    descriptor.value = function (...args: any[]) {\n      ensureInit(this);\n\n      const conf = getElementConfig(this);\n      const currentWin = conf.window;\n      const swcId = this._swcId;\n      const currentDoc = currentWin.document;\n      const hostSet = SwcUtils.getHelperAndHostSet(currentWin, this);\n      const pos = options.position;\n\n      const resToNodes = (res: string | Node) => {\n        const nodes: Node[] = [];\n\n        if (typeof res === 'string' && (pos === 'replaceChildrenHtml' || pos === 'appendHtml' || pos === 'prependHtml')) {\n          const t = currentWin.document.createElement('template');\n          t.innerHTML = res;\n          nodes.push(...Array.from(t.content.childNodes));\n        } else if (typeof res === 'string' && (pos === 'replaceChildrenText' || pos === 'prependText' || pos === 'appendText')) {\n          nodes.push(currentWin.document.createTextNode(res));\n        } else if (typeof res === 'object') {\n          nodes.push(res);\n        }\n        SwcUtils.projectProcessHtml(swcId, nodes, currentDoc);\n        return nodes;\n      }\n\n      const fallbackNodes: Node[] = [];\n      if (options.fallback) {\n        const res: string | Node = options.fallback.call(this, hostSet);\n        const nodes: Node[] = resToNodes(res);\n        fallbackNodes.push(...nodes);\n        applyToDom(swcId, targetId, options.position, nodes);\n      }\n\n      let res = original.apply(this, args);\n      if (res instanceof Promise) {\n        return res.then(asyncRes => {\n          const nodes = resToNodes(asyncRes)\n          fallbackNodes.forEach((it: any) => it.remove());\n          applyToDom(swcId, targetId, options.position, nodes);\n        })\n      } else {\n        const nodes: Node[] = resToNodes(res);\n        applyToDom(swcId, targetId, options.position, nodes);\n      }\n    };\n  };\n}\n\nexport function clearSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'clear'});\n}\n\nexport function prependHtmlSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'prependHtml'});\n}\n\nexport function prependSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'prepend'});\n}\n\nexport function prependTextSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'prependText'});\n}\n\nexport function appendHtmlSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'appendHtml'});\n}\n\nexport function appendTextSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'appendText'});\n}\n\nexport function appendSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'append'});\n}\n\nexport function replaceChildrenHtmlSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'replaceChildrenHtml'});\n}\n\nexport function replaceChildrenSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'replaceChildren'});\n}\n\nexport function replaceChildrenTextSlot(targetId: string): MethodDecorator {\n  return applySlot(targetId, {position: 'replaceChildrenText'});\n}\n\n// export const findAllApplySlotMetadata = (target: any): Map<string | symbol, ApplySlotMetadata> => {\nexport const findAllApplySlotMetadata = (target: any): ApplySlotMetadata[] => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);\n};"],
+  "mappings": "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",
+  "names": ["res"]
 }

package/dist/esm/decorators/changedAttributeThis.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/decorators/changedAttributeThis.ts"],
-  "sourcesContent": ["import { ReflectUtils } from '@dooboostore/core';\n\nexport const ON_ATTRIBUTE_CHANGED_METADATA_KEY = Symbol.for('simple-web-component:on-attribute-changed');\n\nexport interface ChangedAttributeThisOptions {\n  type?: typeof Number | typeof Boolean | typeof String;\n  while?: 'connected';\n}\n\nexport interface ChangedAttributeThisMetadata {\n  attributeName: string;\n  propertyKey: string | symbol;\n  options: ChangedAttributeThisOptions;\n}\n\nconst convertValue = (val: any, type: any): any => {\n  if (val === null || val === undefined) return val;\n  if (type === Number) return Number(val);\n  if (type === Boolean) return val === 'false' || val === '0' ? false : true;\n  return val;\n};\n\n/**\n * @changedAttributeThis decorator - fires when any attribute on $this changes\n */\nexport function changedAttributeThis(attributeName?: string, options: ChangedAttributeThisOptions = {}): MethodDecorator {\n  return (target: Object, propertyKey: string | symbol) => {\n    const constructor = target.constructor;\n    let metaList = ReflectUtils.getOwnMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) as ChangedAttributeThisMetadata[];\n    if (!metaList) {\n      metaList = [];\n      ReflectUtils.defineMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, metaList, constructor);\n    }\n\n    const name = attributeName || String(propertyKey);\n    metaList.push({\n      attributeName: name,\n      propertyKey,\n      options\n    });\n  };\n}\n\nexport const getChangedAttributeMetadata = (target: any): ChangedAttributeThisMetadata[] | undefined => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.getMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);\n};\n\nexport const findAllAttributeChangedMetadata = (target: any): Map<string, ChangedAttributeThisMetadata[]> => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  const metaList = ReflectUtils.findAllMetadata<ChangedAttributeThisMetadata[]>(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) || [];\n\n  const result = new Map<string, ChangedAttributeThisMetadata[]>();\n  metaList.forEach(meta => {\n    meta.forEach(item => {\n      if (!result.has(item.attributeName)) {\n        result.set(item.attributeName, []);\n      }\n      result.get(item.attributeName)!.push(item);\n    });\n  });\n  return result;\n};\n\nexport const convertAttributeValue = (val: any, type?: typeof Number | typeof Boolean | typeof String): any => {\n  return convertValue(val, type);\n};\n"],
+  "sourcesContent": ["import { ReflectUtils } from '@dooboostore/core';\n\nexport const ON_ATTRIBUTE_CHANGED_METADATA_KEY = Symbol.for('simple-web-component:on-attribute-changed');\n\nexport interface ChangedAttributeThisOptions  {\n  type?: typeof Number | typeof Boolean | typeof String;\n  while?: 'connected';\n}\n\nexport interface ChangedAttributeThisMetadata {\n  attributeName: string;\n  propertyKey: string | symbol;\n  options: ChangedAttributeThisOptions;\n}\n\nconst convertValue = (val: any, type: any): any => {\n  if (val === null || val === undefined) return val;\n  if (type === Number) return Number(val);\n  if (type === Boolean) return val === 'false' || val === '0' ? false : true;\n  return val;\n};\n\n/**\n * @changedAttributeThis decorator - fires when any attribute on $this changes\n */\nexport function changedAttributeThis(attributeName?: string, options: ChangedAttributeThisOptions = {}): MethodDecorator {\n  return (target: Object, propertyKey: string | symbol) => {\n    const constructor = target.constructor;\n    let metaList = ReflectUtils.getOwnMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) as ChangedAttributeThisMetadata[];\n    if (!metaList) {\n      metaList = [];\n      ReflectUtils.defineMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, metaList, constructor);\n    }\n\n    const name = attributeName || String(propertyKey);\n    metaList.push({\n      attributeName: name,\n      propertyKey,\n      options\n    });\n  };\n}\n\nexport const getChangedAttributeMetadata = (target: any): ChangedAttributeThisMetadata[] | undefined => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.getMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);\n};\n\nexport const findAllAttributeChangedMetadata = (target: any): Map<string, ChangedAttributeThisMetadata[]> => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  const metaList = ReflectUtils.findAllMetadata<ChangedAttributeThisMetadata[]>(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) || [];\n\n  const result = new Map<string, ChangedAttributeThisMetadata[]>();\n  metaList.forEach(meta => {\n    meta.forEach(item => {\n      if (!result.has(item.attributeName)) {\n        result.set(item.attributeName, []);\n      }\n      result.get(item.attributeName)!.push(item);\n    });\n  });\n  return result;\n};\n\nexport const convertAttributeValue = (val: any, type?: typeof Number | typeof Boolean | typeof String): any => {\n  return convertValue(val, type);\n};\n"],
   "mappings": "AAAA,SAAS,oBAAoB;AAEtB,MAAM,oCAAoC,OAAO,IAAI,2CAA2C;AAavG,MAAM,eAAe,CAAC,KAAU,SAAmB;AACjD,MAAI,QAAQ,QAAQ,QAAQ,OAAW,QAAO;AAC9C,MAAI,SAAS,OAAQ,QAAO,OAAO,GAAG;AACtC,MAAI,SAAS,QAAS,QAAO,QAAQ,WAAW,QAAQ,MAAM,QAAQ;AACtE,SAAO;AACT;AAKO,SAAS,qBAAqB,eAAwB,UAAuC,CAAC,GAAoB;AACvH,SAAO,CAAC,QAAgB,gBAAiC;AACvD,UAAM,cAAc,OAAO;AAC3B,QAAI,WAAW,aAAa,eAAe,mCAAmC,WAAW;AACzF,QAAI,CAAC,UAAU;AACb,iBAAW,CAAC;AACZ,mBAAa,eAAe,mCAAmC,UAAU,WAAW;AAAA,IACtF;AAEA,UAAM,OAAO,iBAAiB,OAAO,WAAW;AAChD,aAAS,KAAK;AAAA,MACZ,eAAe;AAAA,MACf;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEO,MAAM,8BAA8B,CAAC,WAA4D;AACtG,QAAM,cAAc,kBAAkB,WAAW,SAAS,OAAO;AACjE,SAAO,aAAa,YAAY,mCAAmC,WAAW;AAChF;AAEO,MAAM,kCAAkC,CAAC,WAA6D;AAC3G,QAAM,cAAc,kBAAkB,WAAW,SAAS,OAAO;AACjE,QAAM,WAAW,aAAa,gBAAgD,mCAAmC,WAAW,KAAK,CAAC;AAElI,QAAM,SAAS,oBAAI,IAA4C;AAC/D,WAAS,QAAQ,UAAQ;AACvB,SAAK,QAAQ,UAAQ;AACnB,UAAI,CAAC,OAAO,IAAI,KAAK,aAAa,GAAG;AACnC,eAAO,IAAI,KAAK,eAAe,CAAC,CAAC;AAAA,MACnC;AACA,aAAO,IAAI,KAAK,aAAa,EAAG,KAAK,IAAI;AAAA,IAC3C,CAAC;AAAA,EACH,CAAC;AACD,SAAO;AACT;AAEO,MAAM,wBAAwB,CAAC,KAAU,SAA+D;AAC7G,SAAO,aAAa,KAAK,IAAI;AAC/B;",
   "names": []
 }

package/dist/esm/decorators/elementDefine.js

@@ -3,18 +3,17 @@ import { getAddEventListenerMetadata } from "./addEventListener.js";
 import { findAllLifecycleMetadata, findAllOnConnectedAfterMetadata, findAllOnConnectedBeforeMetadata, findAllOnConnectedMetadata, ON_AFTER_ADOPTED_METADATA_KEY, ON_AFTER_DISCONNECTED_METADATA_KEY, ON_BEFORE_ADOPTED_METADATA_KEY, ON_BEFORE_DISCONNECTED_METADATA_KEY, ON_CONNECTED_COMPLETED_METADATA_KEY, ON_INITIALIZE_METADATA_KEY } from "./lifecycles.js";
 import { getEmitCustomEventMetadataList } from "./emitCustomEvent.js";
 import { convertAttributeValue, findAllAttributeChangedMetadata } from "./changedAttributeThis.js";
-import { findAllAttributeApplyMetadata } from "./applyAttribute.js";
-import { findAllAttributeMetadata, getAttributeValue } from "./attribute.js";
+import { findAllAttributeApplyMetadata, findAllAttributeMetadata, getAttributeValue } from "./applyAttribute.js";
 import { getQueryMetadata } from "./query.js";
 import { getQueryAllMetadata } from "./queryAll.js";
 import { SwcUtils } from "../utils/Utils.js";
 import { DOM_EVENT_NAMES, HTML_TAG_ENTRIES } from "../config/config.js";
 import { SituationTypeContainer, SituationTypeContainers } from "@dooboostore/simple-boot/decorators/inject/Inject";
 import { InjectSituationType } from "../types/index.js";
-import { ConvertUtils, ElementApply, NodeSlot } from "@dooboostore/core-web";
+import { ConvertUtils, ElementApply } from "@dooboostore/core-web";
 import { isSSR } from "../elements/SwcAppMixin.js";
-import { findAllApplySlotMetadata } from "./applySlot.js";
 import { findAllStateMetadata } from "./state.js";
+import { findAllPropertyMetadata } from "./applyProperty.js";
 const ELEMENT_CONFIG_KEY = Symbol.for("simple-web-component:element-config");
 const getElementConfig = (target) => {
   const constructor = target instanceof Function ? target : target.constructor;
@@ -27,13 +26,12 @@ const ensureInit = (inst) => {
     inst._boundListeners = [];
     inst.__swc_initialized = true;
     const target = inst instanceof Function ? inst : inst.constructor;
-    const attributeList = findAllAttributeMetadata(target);
-    attributeList.forEach((meta) => {
-      const initUserData = inst[meta.propertyKey];
-      delete inst[meta.propertyKey];
-      if (initUserData !== void 0)
-        inst[meta.propertyKey] = initUserData;
-    });
+    const attributeAllList = findAllAttributeMetadata(target).filter((it) => it.type === "property");
+    if (attributeAllList) {
+      attributeAllList.forEach((meta) => {
+        delete inst[meta.propertyKey];
+      });
+    }
     const queryList = getQueryMetadata(target);
     if (queryList) {
       queryList.forEach((meta) => {
@@ -46,9 +44,9 @@ const ensureInit = (inst) => {
         delete inst[meta.propertyKey];
       });
     }
-    const slotAllList = findAllApplySlotMetadata(target);
-    if (slotAllList) {
-      slotAllList.filter((it) => it.type === "property").forEach((meta) => {
+    const propertyAllList = findAllPropertyMetadata(target).filter((it) => it.type === "property");
+    if (propertyAllList) {
+      propertyAllList.forEach((meta) => {
         delete inst[meta.propertyKey];
       });
     }
@@ -105,24 +103,6 @@ const getHandlers = (inst) => {
 const setupPrototype = (proto, win) => {
   if (proto.__swc_proto_setup) return;
   proto.__swc_proto_setup = true;
-  proto.createSlotString = function(id) {
-    return NodeSlot.slot(`${this._swcId}-${id}`);
-  };
-  proto.createEaHtml = function(id, script) {
-    return ElementApply.html(id, script);
-  };
-  proto.createEaText = function(id, script) {
-    return ElementApply.text(id, script);
-  };
-  proto.createEaAttribute = function(id, name, script) {
-    return ElementApply.attribute(id, name, script);
-  };
-  proto.createEaEvent = function(id, name, script) {
-    return ElementApply.event(id, name, script);
-  };
-  proto.createEaProperty = function(id, name, script) {
-    return ElementApply.property(id, name, script);
-  };
   proto._executeSwcScript = function(attrName, hostSet, extraArgs = {}) {
     ensureInit(this);
     const script = this.getAttribute(attrName);
@@ -252,8 +232,8 @@ const elementDefine = (name, config = {}) => (constructor) => {
   const applyAttributeMap = findAllAttributeApplyMetadata(constructor);
   const swcLifecycleAttributes = ["swc-on-constructor", "swc-on-connected", "swc-on-disconnected", "swc-on-before-connected", "swc-on-after-connected", "swc-on-before-disconnected", "swc-on-after-disconnected", "swc-on-before-adopted", "swc-on-after-adopted", "swc-on-attribute-changed"];
   const swcOnEvents = DOM_EVENT_NAMES.map((e) => `swc-on-${e}`);
-  const attributeApplyNames = Array.from(applyAttributeMap.values()).map((it) => it.options.name).filter(Boolean);
-  const hostAttributes = attributeList.filter((it) => it.selector === "$this").map((it) => it.options.name || String(it.propertyKey));
+  const attributeApplyNames = Array.from(applyAttributeMap.values()).map((it) => it.targetAttributeName).filter(Boolean);
+  const hostAttributes = attributeList.filter((it) => it.selector === "$this").map((it) => it.propertyKey || String(it.propertyKey));
   const originalStaticObservedAttributes = constructor.observedAttributes ?? [];
   const mergedObservedAttributes = [.../* @__PURE__ */ new Set([...metadata.observedAttributes ?? [], ...originalStaticObservedAttributes, ...attrChangeMap.keys(), ...attributeApplyNames, ...hostAttributes, ...emitHostCustomEventList.map((it) => it.options.attributeName).filter(Boolean), ...swcLifecycleAttributes, ...swcOnEvents])];
   const proto = constructor.prototype;