@domql/element 2.32.14 → 2.32.15

package/create.js

@@ -451,6 +451,7 @@ const addCaching = (element, parent) => {
 
   // enable CACHING
   if (!ref.__cached) ref.__cached = {}
+  if (!ref.__cachedContent) ref.__cachedContent = null
   if (!ref.__defineCache) ref.__defineCache = {}
 
   // enable EXEC

package/dist/cjs/create.js

@@ -309,6 +309,7 @@ const addCaching = (element, parent2) => {
   let { __ref: parentRef } = parent2;
   if (!element.transform) element.transform = {};
   if (!ref.__cached) ref.__cached = {};
+  if (!ref.__cachedContent) ref.__cachedContent = null;
   if (!ref.__defineCache) ref.__defineCache = {};
   if (!ref.__exec) ref.__exec = {};
   if (!ref.__execProps) ref.__execProps = {};

package/dist/cjs/methods/index.js

@@ -151,10 +151,13 @@ function setNodeStyles(params = {}) {
   return el;
 }
 async function remove(opts = {}) {
+  var _a;
   const element = this;
   const beforeRemoveReturns = (0, import_event.triggerEventOn)("beforeRemove", element, opts);
   if (beforeRemoveReturns === false) return element;
   if ((0, import_utils.isFunction)(element.node.remove)) element.node.remove();
+  else if ((_a = element.node) == null ? void 0 : _a.parentNode)
+    element.node.parentNode.removeChild(element.node);
   else if (!(0, import_utils.isProduction)()) {
     console.warn("This item cant be removed");
     element.log();

package/dist/cjs/mixins/content.js

@@ -39,24 +39,24 @@ const removeContent = function(el, opts = {}) {
   const { __ref: ref } = element;
   const contentElementKey = (0, import_utils.setContentKey)(element, opts);
   if (opts.contentElementKey !== "content") opts.contentElementKey = "content";
-  if (element[contentElementKey]) {
-    if (element[contentElementKey].node && element.node) {
-      if (element[contentElementKey].tag === "fragment")
+  const contentElement = element[contentElementKey];
+  if (contentElement) {
+    if (contentElement.node && element.node) {
+      if (contentElement.tag === "fragment")
         element.node.innerHTML = "";
       else {
-        const contentNode = element[contentElementKey].node;
+        const contentNode = contentElement.node;
         if (contentNode.parentNode === element.node)
-          element.node.removeChild(element[contentElementKey].node);
+          element.node.removeChild(contentElement.node);
       }
     }
-    const { __cached } = ref;
-    if (__cached && __cached[contentElementKey]) {
-      const cachedContent = __cached[contentElementKey];
-      if (cachedContent.tag === "fragment")
-        cachedContent.parent.node.innerHTML = "";
-      else if (cachedContent && (0, import_utils.isFunction)(cachedContent.remove))
-        cachedContent.remove();
-      delete __cached[contentElementKey];
+    const { __cachedContent } = ref;
+    if (__cachedContent) {
+      if (__cachedContent.tag === "fragment")
+        __cachedContent.parent.node.innerHTML = "";
+      else if (__cachedContent && (0, import_utils.isFunction)(__cachedContent.remove))
+        __cachedContent.remove();
+      delete ref.__cachedContent;
     }
     ref.__children.splice(ref.__children.indexOf(contentElementKey), 1);
     delete element[contentElementKey];
@@ -65,12 +65,15 @@ const removeContent = function(el, opts = {}) {
 async function setContent(param, element, node, opts) {
   var _a;
   const contentElementKey = (0, import_utils.setContentKey)(element, opts);
-  if (param && element) {
+  if (!element) this.warn("No element to set content on");
+  if (param) {
     if ((_a = element[contentElementKey]) == null ? void 0 : _a.update) {
       await element[contentElementKey].update({}, opts);
     } else {
       await import_set.set.call(element, param, opts);
     }
+  } else {
+    removeContent(element, opts);
   }
 }
 var content_default = setContent;

package/dist/cjs/set.js

@@ -33,8 +33,6 @@ var import_event = require("@domql/event");
 const resetElement = async (params, element, options) => {
   if (!options.preventRemove) (0, import_content.removeContent)(element, options);
   const { __ref: ref } = element;
-  const contentElementKey = (0, import_utils.setContentKey)(element, options);
-  const { __cached } = ref;
   const newContent = await (0, import_create.create)(
     params,
     element,
@@ -46,7 +44,7 @@ const resetElement = async (params, element, options) => {
       ...options
     }
   );
-  __cached[contentElementKey] = newContent;
+  ref.__cachedContent = newContent;
 };
 const reset = async (options) => {
   const element = void 0;
@@ -106,6 +104,8 @@ const set = async function(params, options = {}, el) {
         }
       });
     } else await resetElement(params, element, options);
+  } else {
+    if (!options.preventRemove) (0, import_content.removeContent)(element, options);
   }
   return element;
 };

package/dist/esm/create.js

@@ -305,6 +305,7 @@ const addCaching = (element, parent2) => {
   let { __ref: parentRef } = parent2;
   if (!element.transform) element.transform = {};
   if (!ref.__cached) ref.__cached = {};
+  if (!ref.__cachedContent) ref.__cachedContent = null;
   if (!ref.__defineCache) ref.__defineCache = {};
   if (!ref.__exec) ref.__exec = {};
   if (!ref.__execProps) ref.__execProps = {};

package/dist/esm/methods/index.js

@@ -110,10 +110,13 @@ function setNodeStyles(params = {}) {
   return el;
 }
 async function remove(opts = {}) {
+  var _a;
   const element = this;
   const beforeRemoveReturns = triggerEventOn("beforeRemove", element, opts);
   if (beforeRemoveReturns === false) return element;
   if (isFunction(element.node.remove)) element.node.remove();
+  else if ((_a = element.node) == null ? void 0 : _a.parentNode)
+    element.node.parentNode.removeChild(element.node);
   else if (!isProduction()) {
     console.warn("This item cant be removed");
     element.log();

package/dist/esm/mixins/content.js

@@ -13,24 +13,24 @@ const removeContent = function(el, opts = {}) {
   const { __ref: ref } = element;
   const contentElementKey = setContentKey(element, opts);
   if (opts.contentElementKey !== "content") opts.contentElementKey = "content";
-  if (element[contentElementKey]) {
-    if (element[contentElementKey].node && element.node) {
-      if (element[contentElementKey].tag === "fragment")
+  const contentElement = element[contentElementKey];
+  if (contentElement) {
+    if (contentElement.node && element.node) {
+      if (contentElement.tag === "fragment")
         element.node.innerHTML = "";
       else {
-        const contentNode = element[contentElementKey].node;
+        const contentNode = contentElement.node;
         if (contentNode.parentNode === element.node)
-          element.node.removeChild(element[contentElementKey].node);
+          element.node.removeChild(contentElement.node);
       }
     }
-    const { __cached } = ref;
-    if (__cached && __cached[contentElementKey]) {
-      const cachedContent = __cached[contentElementKey];
-      if (cachedContent.tag === "fragment")
-        cachedContent.parent.node.innerHTML = "";
-      else if (cachedContent && isFunction(cachedContent.remove))
-        cachedContent.remove();
-      delete __cached[contentElementKey];
+    const { __cachedContent } = ref;
+    if (__cachedContent) {
+      if (__cachedContent.tag === "fragment")
+        __cachedContent.parent.node.innerHTML = "";
+      else if (__cachedContent && isFunction(__cachedContent.remove))
+        __cachedContent.remove();
+      delete ref.__cachedContent;
     }
     ref.__children.splice(ref.__children.indexOf(contentElementKey), 1);
     delete element[contentElementKey];
@@ -39,12 +39,15 @@ const removeContent = function(el, opts = {}) {
 async function setContent(param, element, node, opts) {
   var _a;
   const contentElementKey = setContentKey(element, opts);
-  if (param && element) {
+  if (!element) this.warn("No element to set content on");
+  if (param) {
     if ((_a = element[contentElementKey]) == null ? void 0 : _a.update) {
       await element[contentElementKey].update({}, opts);
     } else {
       await set.call(element, param, opts);
     }
+  } else {
+    removeContent(element, opts);
   }
 }
 var content_default = setContent;

package/dist/esm/set.js

@@ -7,8 +7,6 @@ import { triggerEventOn, triggerEventOnUpdate } from "@domql/event";
 const resetElement = async (params, element, options) => {
   if (!options.preventRemove) removeContent(element, options);
   const { __ref: ref } = element;
-  const contentElementKey = setContentKey(element, options);
-  const { __cached } = ref;
   const newContent = await create(
     params,
     element,
@@ -20,7 +18,7 @@ const resetElement = async (params, element, options) => {
       ...options
     }
   );
-  __cached[contentElementKey] = newContent;
+  ref.__cachedContent = newContent;
 };
 const reset = async (options) => {
   const element = void 0;
@@ -80,6 +78,8 @@ const set = async function(params, options = {}, el) {
         }
       });
     } else await resetElement(params, element, options);
+  } else {
+    if (!options.preventRemove) removeContent(element, options);
   }
   return element;
 };

package/methods/index.js

@@ -138,6 +138,8 @@ export async function remove(opts = {}) {
   const beforeRemoveReturns = triggerEventOn('beforeRemove', element, opts)
   if (beforeRemoveReturns === false) return element
   if (isFunction(element.node.remove)) element.node.remove()
+  else if (element.node?.parentNode)
+    element.node.parentNode.removeChild(element.node)
   else if (!isProduction()) {
     console.warn('This item cant be removed')
     element.log()

package/mixins/content.js

@@ -21,25 +21,25 @@ export const removeContent = function (el, opts = {}) {
   const contentElementKey = setContentKey(element, opts)
 
   if (opts.contentElementKey !== 'content') opts.contentElementKey = 'content'
-  if (element[contentElementKey]) {
-    if (element[contentElementKey].node && element.node) {
-      if (element[contentElementKey].tag === 'fragment')
+  const contentElement = element[contentElementKey]
+  if (contentElement) {
+    if (contentElement.node && element.node) {
+      if (contentElement.tag === 'fragment')
         element.node.innerHTML = '' // TODO: deep check to only remove `content` children and not other children
       else {
-        const contentNode = element[contentElementKey].node
+        const contentNode = contentElement.node
         if (contentNode.parentNode === element.node)
-          element.node.removeChild(element[contentElementKey].node)
+          element.node.removeChild(contentElement.node)
       }
     }
 
-    const { __cached } = ref
-    if (__cached && __cached[contentElementKey]) {
-      const cachedContent = __cached[contentElementKey]
-      if (cachedContent.tag === 'fragment')
-        cachedContent.parent.node.innerHTML = ''
-      else if (cachedContent && isFunction(cachedContent.remove))
-        cachedContent.remove()
-      delete __cached[contentElementKey]
+    const { __cachedContent } = ref
+    if (__cachedContent) {
+      if (__cachedContent.tag === 'fragment')
+        __cachedContent.parent.node.innerHTML = ''
+      else if (__cachedContent && isFunction(__cachedContent.remove))
+        __cachedContent.remove()
+      delete ref.__cachedContent
     }
 
     ref.__children.splice(ref.__children.indexOf(contentElementKey), 1)
@@ -54,12 +54,16 @@ export const removeContent = function (el, opts = {}) {
  */
 export async function setContent(param, element, node, opts) {
   const contentElementKey = setContentKey(element, opts)
-  if (param && element) {
+  if (!element) this.warn('No element to set content on')
+
+  if (param) {
     if (element[contentElementKey]?.update) {
       await element[contentElementKey].update({}, opts)
     } else {
       await set.call(element, param, opts)
     }
+  } else {
+    removeContent(element, opts)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.32.14",
+  "version": "2.32.15",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -27,12 +27,12 @@
     "prepublish": "npx rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.32.14",
-    "@domql/render": "^2.32.14",
-    "@domql/state": "^2.32.14",
-    "@domql/utils": "^2.32.14"
+    "@domql/event": "^2.32.15",
+    "@domql/render": "^2.32.15",
+    "@domql/state": "^2.32.15",
+    "@domql/utils": "^2.32.15"
   },
-  "gitHead": "b9c8c8e0b8c5a9172678236729c78f7b8a1ec116",
+  "gitHead": "6a415e03899ef8fed12e0f85bdd58026b240f7f7",
   "devDependencies": {
     "@babel/core": "^7.27.1"
   }

package/set.js

@@ -11,8 +11,6 @@ import { triggerEventOn, triggerEventOnUpdate } from '@domql/event'
 export const resetElement = async (params, element, options) => {
   if (!options.preventRemove) removeContent(element, options)
   const { __ref: ref } = element
-  const contentElementKey = setContentKey(element, options)
-  const { __cached } = ref
   const newContent = await create(
     params,
     element,
@@ -24,7 +22,7 @@ export const resetElement = async (params, element, options) => {
       ...options
     }
   )
-  __cached[contentElementKey] = newContent
+  ref.__cachedContent = newContent
 }
 
 export const reset = async (options) => {
@@ -113,6 +111,8 @@ export const set = async function (params, options = {}, el) {
         }
       })
     } else await resetElement(params, element, options)
+  } else {
+    if (!options.preventRemove) removeContent(element, options)
   }
 
   return element