@dooboostore/simple-web-component 1.0.38 → 1.0.39

package/dist/esm-bundle/dooboostore-simple-web-component.esm.js

@@ -9443,98 +9443,6 @@ var InjectSituationType = /* @__PURE__ */ ((InjectSituationType2) => {
   return InjectSituationType2;
 })(InjectSituationType || {});
 
-// src/decorators/applySlot.ts
-var APPLY_SLOT_METADATA_KEY = Symbol.for("simple-web-component:apply-slot");
-function applySlot(id, options = { position: "replaceChildrenHtml" }) {
-  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 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);
-          }
-        }
-        return res;
-      };
-    }
-  };
-}
-var 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 applySlotPrependHtml(id) {
-  return applySlot(id, { position: "prependHtml" });
-}
-var applySlotPrepend = applySlotPrependHtml;
-function applySlotPrependText(id) {
-  return applySlot(id, { position: "prependText" });
-}
-function applySlotAppendHtml(id) {
-  return applySlot(id, { position: "appendHtml" });
-}
-function applySlotAppendText(id) {
-  return applySlot(id, { position: "appendText" });
-}
-var applySlotAppend = applySlotAppendHtml;
-function applySlotReplaceChildrenHtml(id) {
-  return applySlot(id, { position: "replaceChildrenHtml" });
-}
-var applySlotReplaceChildren = applySlotReplaceChildrenHtml;
-function applySlotReplaceChildrenText(id) {
-  return applySlot(id, { position: "replaceChildrenText" });
-}
-
 // src/decorators/state.ts
 var STATE_METADATA_KEY = Symbol.for("simple-web-component:state");
 function state(nameOrTarget, propertyKey) {
@@ -9542,7 +9450,6 @@ function state(nameOrTarget, propertyKey) {
     let storage = targetObj[stateMetadata.propertyKey];
     Object.defineProperty(targetObj, stateMetadata.propertyKey, {
       set(nv) {
-        console.log("setState!!", nv);
         storage = nv;
         const config = getElementConfig(this);
         const ea = new ElementApply(this, { id: this._swcId });
@@ -9624,12 +9531,6 @@ var ensureInit = (inst) => {
         delete inst[meta.propertyKey];
       });
     }
-    const slotAllList = findAllApplySlotMetadata(target);
-    if (slotAllList) {
-      slotAllList.filter((it) => it.type === "property").forEach((meta) => {
-        delete inst[meta.propertyKey];
-      });
-    }
     const stateAllList = findAllStateMetadata(target);
     if (stateAllList) {
       stateAllList.forEach((meta) => {
@@ -10316,56 +10217,42 @@ var findAllAttributeMetadata = (target) => {
 
 // src/decorators/applyNode.ts
 var APPLY_NODE_METADATA_KEY = Symbol.for("simple-web-component:apply-node");
-var normalizeNodes = (res, doc) => {
-  const items = Array.isArray(res) ? res : [res];
-  return items.map((it) => {
-    if (it instanceof Node) return it;
-    return doc.createTextNode(it !== void 0 && it !== null ? String(it) : "");
-  });
-};
 var applyToDom = (currentThis, targetEl, res, pos, win, host) => {
   if (!targetEl) return;
   const doc = win.document;
   const hostSet = SwcUtils.getHelperAndHostSet(win, currentThis);
   const id = currentThis._swcId;
-  try {
-    if (typeof res === "string") {
-      const processed = SwcUtils.projectProcessHtml(id, res, doc);
-      if (processed !== void 0) res = processed;
-    } else if (res) {
-      SwcUtils.projectProcessHtml(id, res, doc);
-    }
-  } catch (e) {
-  }
-  if (pos === "innerHtml") {
-    targetEl.innerHTML = res !== void 0 && res !== null ? String(res) : "";
-    return;
-  }
-  if (pos === "innerText") {
-    if (targetEl.innerText !== void 0) {
-      targetEl.innerText = res !== void 0 && res !== null ? String(res) : "";
-    }
-    return;
-  }
-  const stateContext = { ...hostSet };
-  findAllStateMetadata(currentThis).forEach((it) => {
-    stateContext[it.name] = currentThis[it.propertyKey];
-  });
-  new ElementApply(currentThis, { id: currentThis._swcId }).apply({ target: "noInitialized", context: stateContext, bind: currentThis });
+  const nodes = [];
+  if (typeof res === "string" && pos === "innerHtml") {
+    const t = win.document.createElement("template");
+    t.innerHTML = res;
+    nodes.push(...Array.from(t.content.childNodes));
+  } else if (typeof res === "string" && pos === "innerText") {
+    nodes.push(win.document.createTextNode(res));
+  }
+  SwcUtils.projectProcessHtml(id, nodes, doc);
   const isShadowRoot = targetEl instanceof win.ShadowRoot;
-  const nodes = normalizeNodes(res, doc);
   if (pos === "replace") {
     if (!isShadowRoot) targetEl.replaceWith(...nodes);
+  } else if (pos === "innerHtml") {
+    targetEl.replaceChildren(...nodes);
+  } else if (pos === "innerText") {
+    targetEl.replaceChildren(...nodes);
   } else if (pos === "replaceChildren") {
     targetEl.replaceChildren(...nodes);
   } else {
     if (pos === "beforeEnd") {
-      console.log("tarbbbbbbbbbbbbbb");
       targetEl.append(...nodes);
     } else if (pos === "afterBegin") targetEl.prepend(...nodes);
     else if (pos === "beforeBegin" && !isShadowRoot) targetEl.before(...nodes);
     else if (pos === "afterEnd" && !isShadowRoot) targetEl.after(...nodes);
   }
+  const stateContext = { ...hostSet };
+  findAllStateMetadata(currentThis).forEach((it) => {
+    stateContext[it.name] = currentThis[it.propertyKey];
+  });
+  new ElementApply(targetEl, { id }).apply({ target: "noInitialized", context: stateContext, bind: currentThis });
+  return nodes;
 };
 function applyNode(selector, options = { position: "replaceChildren" }) {
   return (targetObj, propertyKey, descriptor) => {
@@ -10412,13 +10299,14 @@ function applyNode(selector, options = { position: "replaceChildren" }) {
           applyToDom(this, target, processedVal, pos, currentWin);
         }
       };
+      const fallbackNodes = [];
+      if (targetEl && options.fallback) {
+        const loadingRes = options.fallback.call(this, hostSet);
+        fallbackNodes.push(...applyToDom(this, targetEl, loadingRes, options.position || "beforeEnd", currentWin));
+      }
       if (res instanceof Promise) {
-        if (targetEl && options.fallback) {
-          const loadingRes = options.fallback.call(this, hostSet);
-          applyToDom(this, targetEl, loadingRes, options.position || "beforeEnd", currentWin);
-        }
         return res.then((finalRes) => {
-          console.log("amnkj");
+          fallbackNodes.forEach((it) => it.remove());
           if (finalRes !== void 0 && targetEl) runApply(targetEl, finalRes);
           return finalRes;
         });
@@ -10487,7 +10375,7 @@ function applyNodeThisAfterBeginLightDom(targetOrOptions, propertyKey, descripto
   const opt = targetOrOptions || {};
   return applyNode("$this", { ...opt, ...option });
 }
-function applyThisInnerHtmlNode(targetOrOptions, propertyKey, descriptor) {
+function applyNodeThisInnerHtml(targetOrOptions, propertyKey, descriptor) {
   const option = { position: "innerHtml" };
   if (propertyKey !== void 0) return applyNode("$this", option)(targetOrOptions, propertyKey, descriptor);
   const opt = targetOrOptions || {};
@@ -10983,6 +10871,103 @@ var getPublishSwcAppMessageMetadata = (target) => {
   return ReflectUtils.getOwnMetadata(PUBLISH_SWC_APP_MESSAGE_METADATA_KEY, constructor);
 };
 
+// src/decorators/applySlot.ts
+var APPLY_SLOT_METADATA_KEY = Symbol.for("simple-web-component:apply-slot");
+var applyToDom2 = (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 options = { position: "replaceChildrenHtml", ...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, 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);
+        }
+        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);
+        applyToDom2(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());
+          applyToDom2(swcId, targetId, options.position, nodes);
+        });
+      } else {
+        const nodes = resToNodes(res);
+        applyToDom2(swcId, targetId, options.position, nodes);
+      }
+    };
+  };
+}
+var findAllApplySlotMetadata = (target) => {
+  const constructor = target instanceof Function ? target : target.constructor;
+  return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);
+};
+function applySlotClear(targetId) {
+  return applySlot(targetId, { position: "clear" });
+}
+function applySlotPrependHtml(targetId) {
+  return applySlot(targetId, { position: "prependHtml" });
+}
+var applySlotPrepend = applySlotPrependHtml;
+function applySlotPrependText(targetId) {
+  return applySlot(targetId, { position: "prependText" });
+}
+function applySlotAppendHtml(targetId) {
+  return applySlot(targetId, { position: "appendHtml" });
+}
+function applySlotAppendText(targetId) {
+  return applySlot(targetId, { position: "appendText" });
+}
+var applySlotAppend = applySlotAppendHtml;
+function applySlotReplaceChildrenHtml(targetId) {
+  return applySlot(targetId, { position: "replaceChildrenHtml" });
+}
+var applySlotReplaceChildren = applySlotReplaceChildrenHtml;
+function applySlotReplaceChildrenText(targetId) {
+  return applySlot(targetId, { position: "replaceChildrenText" });
+}
+
 // ../simple-boot/dist/esm/index.js
 var import_reflect_metadata = __toESM(require_Reflect(), 1);
 
@@ -13675,6 +13660,7 @@ export {
   applyNodeThisBeforeEnd,
   applyNodeThisBeforeEndLightDom,
   applyNodeThisBeforeEndShadow,
+  applyNodeThisInnerHtml,
   applyNodeThisReplaceChildren,
   applyNodeThisReplaceChildrenLightDom,
   applySlot,
@@ -13690,7 +13676,6 @@ export {
   applySlotReplaceChildrenText,
   applyStyle,
   applyStyleThis,
-  applyThisInnerHtmlNode,
   applyThisInnerHtmlNodeLightDom,
   applyThisReplaceChildrenNodeLightDom,
   attribute,