@domql/element 2.5.75 → 2.5.77

package/dist/cjs/methods/index.js

@@ -105,12 +105,16 @@ const parse = function(excl = []) {
   keyList.forEach((v) => {
     if (excl.includes(v))
       return;
-    let val = element[v];
+    const val = element[v];
     if (v === "state") {
-      if (element.__ref && element.__ref.__hasRootState)
+      if (element.__ref && !element.__ref.__hasRootState)
         return;
-      if ((0, import_utils.isFunction)(val && val.parse))
-        val = val.parse();
+      const parsedVal = (0, import_utils.isFunction)(val && val.parse) ? val.parse() : val;
+      obj[v] = (0, import_utils.isFunction)(parsedVal) ? parsedVal : JSON.parse(JSON.stringify(parsedVal || {}));
+    } else if (v === "scope") {
+      if (element.__ref && !element.__ref.__hasRootScope)
+        return;
+      obj[v] = JSON.parse(JSON.stringify(val || {}));
     } else if (v === "props") {
       const { __element, update, ...props } = element[v];
       obj[v] = props;

package/dist/cjs/mixins/content.js

@@ -47,7 +47,7 @@ const removeContent = function(el) {
   const element = el || this;
   const { __ref } = element;
   if (element.content) {
-    if (element.content.node) {
+    if (element.content.node && element.node) {
       if (element.content.tag === "fragment")
         element.node.innerHTML = "";
       else

package/dist/cjs/mixins/registry.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var registry_exports = {};
 __export(registry_exports, {
+  collectionFilters: () => collectionFilters,
   default: () => registry_default,
   parseFilters: () => parseFilters
 });
@@ -88,8 +89,17 @@ const parseFilters = {
     "content",
     "html",
     "on",
-    "key"
+    "key",
+    "extend",
+    "childExtend",
+    "childExtendRecursive",
+    "scope",
+    "query",
+    "$collection",
+    "$stateCollection",
+    "$propsCollection"
   ],
   propsKeys: ["__element", "update"],
   stateKeys: []
 };
+const collectionFilters = ["$collection", "$stateCollection", "$propsCollection"];

package/dist/cjs/update.js

@@ -170,6 +170,7 @@ const captureSnapshot = (element, options) => {
   return [snapshotOnCallee, calleeElement];
 };
 const checkIfOnUpdate = (element, parent, options) => {
+  var _a;
   if (!(0, import_utils.isFunction)(element.if) || !parent)
     return;
   const ref = element.__ref;
@@ -179,6 +180,7 @@ const checkIfOnUpdate = (element, parent, options) => {
     ref.__if = true;
     if (itWasFalse) {
       delete element.__hash;
+      delete element.__text;
       delete element.extend;
       if (!ref.__hasRootState) {
         delete element.state;
@@ -188,15 +190,26 @@ const checkIfOnUpdate = (element, parent, options) => {
       } else if (!ref.__hasRootState) {
         delete element.state;
       }
-      element.node && element.node.remove();
+      if (element.node) {
+        element.node.remove();
+        delete element.node;
+      }
+      if (element.$collection || element.$stateCollection || element.$propsCollection) {
+        element.removeContent();
+      } else if ((_a = element.content) == null ? void 0 : _a.parseDeep)
+        element.content = element.content.parseDeep();
       const previousElement = element.previousElement();
+      const previousNode = previousElement == null ? void 0 : previousElement.node;
+      const hasPrevious = previousNode == null ? void 0 : previousNode.parentNode;
       const nextElement = element.nextElement();
-      const hasPrevious = previousElement && previousElement.node;
-      const hasNext = nextElement && nextElement.node;
-      const attachOptions = (hasPrevious && hasPrevious.parentNode || hasNext && hasNext.parentNode) && {
+      const nextNode = nextElement == null ? void 0 : nextElement.node;
+      const hasNext = nextNode == null ? void 0 : nextNode.parentNode;
+      const attachOptions = (hasPrevious || hasNext) && {
         position: hasPrevious ? "after" : hasNext ? "before" : null,
-        node: hasPrevious || hasNext
+        node: hasPrevious && previousNode || hasNext && nextNode
       };
+      delete element.__ref;
+      delete element.parent;
       const created = (0, import_create.default)(element, parent, element.key, import_options.default.create, attachOptions);
       if (options.preventUpdate !== true && element.on && (0, import_utils.isFunction)(element.on.update)) {
         (0, import_event.applyEvent)(element.on.update, created, created.state);

package/dist/cjs/utils/extendUtils.js

@@ -19,7 +19,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var extendUtils_exports = {};
 __export(extendUtils_exports, {
   cloneAndMergeArrayExtend: () => cloneAndMergeArrayExtend,
-  deepCloneExtend: () => deepCloneExtend,
   deepExtend: () => deepExtend,
   deepMergeExtend: () => deepMergeExtend,
   extendCachedRegistry: () => extendCachedRegistry,
@@ -81,21 +80,6 @@ const flattenExtend = (extend, stack, context) => {
     deepExtend(extend, stack, context);
   return stack;
 };
-const deepCloneExtend = (obj) => {
-  const o = {};
-  for (const prop in obj) {
-    if (["parent", "node", "__element"].indexOf(prop) > -1)
-      continue;
-    const objProp = obj[prop];
-    if ((0, import_utils.isObject)(objProp)) {
-      o[prop] = deepCloneExtend(objProp);
-    } else if ((0, import_utils.isArray)(objProp)) {
-      o[prop] = objProp.map((x) => x);
-    } else
-      o[prop] = objProp;
-  }
-  return o;
-};
 const deepMergeExtend = (element, extend) => {
   for (const e in extend) {
     if (["parent", "node", "__element"].indexOf(e) > -1)
@@ -119,7 +103,7 @@ const deepMergeExtend = (element, extend) => {
 };
 const cloneAndMergeArrayExtend = (stack) => {
   return stack.reduce((a, c) => {
-    return deepMergeExtend(a, deepCloneExtend(c));
+    return deepMergeExtend(a, (0, import_utils.deepCloneWithExtend)(c));
   }, {});
 };
 const fallbackStringExtend = (extend, context, options = {}) => {

package/methods/index.js

@@ -83,10 +83,14 @@ export const parse = function (excl = []) {
   const keyList = keys.call(element)
   keyList.forEach(v => {
     if (excl.includes(v)) return
-    let val = element[v]
+    const val = element[v]
     if (v === 'state') {
-      if (element.__ref && element.__ref.__hasRootState) return
-      if (isFunction(val && val.parse)) val = val.parse()
+      if (element.__ref && !element.__ref.__hasRootState) return
+      const parsedVal = isFunction(val && val.parse) ? val.parse() : val
+      obj[v] = isFunction(parsedVal) ? parsedVal : JSON.parse(JSON.stringify(parsedVal || {}))
+    } else if (v === 'scope') {
+      if (element.__ref && !element.__ref.__hasRootScope) return
+      obj[v] = JSON.parse(JSON.stringify(val || {}))
     } else if (v === 'props') {
       const { __element, update, ...props } = element[v]
       obj[v] = props

package/mixins/content.js

@@ -15,7 +15,7 @@ export const removeContent = function (el) {
   const { __ref } = element
 
   if (element.content) {
-    if (element.content.node) {
+    if (element.content.node && element.node) {
       if (element.content.tag === 'fragment') element.node.innerHTML = ''
       else element.node.removeChild(element.content.node)
     }

package/mixins/registry.js

@@ -66,8 +66,12 @@ export default {
 export const parseFilters = {
   elementKeys: [
     'tag', 'text', 'style', 'attr', 'class', 'state', 'props',
-    'data', 'content', 'html', 'on', 'key'
+    'data', 'content', 'html', 'on', 'key', 'extend', 'childExtend',
+    'childExtendRecursive', 'scope', 'query',
+    '$collection', '$stateCollection', '$propsCollection'
   ],
   propsKeys: ['__element', 'update'],
   stateKeys: []
 }
+
+export const collectionFilters = ['$collection', '$stateCollection', '$propsCollection']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.75",
+  "version": "2.5.77",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "aed026de97492c8c0e4da1f47cb027bc6db63362",
+  "gitHead": "20db0bd2a45b9f1037d8ca6a7fb3fd66197a3056",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/update.js

@@ -183,6 +183,7 @@ const checkIfOnUpdate = (element, parent, options) => {
     ref.__if = true
     if (itWasFalse) {
       delete element.__hash
+      delete element.__text
       delete element.extend
       if (!ref.__hasRootState) {
         delete element.state
@@ -194,19 +195,31 @@ const checkIfOnUpdate = (element, parent, options) => {
         delete element.state
       }
 
-      element.node && element.node.remove()
+      if (element.node) {
+        element.node.remove()
+        delete element.node
+      }
+
+      if (element.$collection || element.$stateCollection || element.$propsCollection) {
+        element.removeContent()
+      } else if (element.content?.parseDeep) element.content = element.content.parseDeep()
 
       const previousElement = element.previousElement()
-      const nextElement = element.nextElement()
+      const previousNode = previousElement?.node // document.body.contains(previousElement.node)
+      const hasPrevious = previousNode?.parentNode // document.body.contains(previousElement.node)
 
-      const hasPrevious = previousElement && previousElement.node
-      const hasNext = nextElement && nextElement.node
+      const nextElement = element.nextElement()
+      const nextNode = nextElement?.node // document.body.contains(previousElement.node)
+      const hasNext = nextNode?.parentNode // && document.body.contains(nextElement.node)
+      // const hasNext = nextElement && document.body.contains(nextElement.node)
 
-      const attachOptions = ((hasPrevious && hasPrevious.parentNode) || (hasNext && hasNext.parentNode)) && {
+      const attachOptions = (hasPrevious || hasNext) && {
         position: hasPrevious ? 'after' : hasNext ? 'before' : null,
-        node: hasPrevious || hasNext
+        node: (hasPrevious && previousNode) || (hasNext && nextNode)
       }
 
+      delete element.__ref
+      delete element.parent
       const created = create(element, parent, element.key, OPTIONS.create, attachOptions)
       // check preventUpdate for an array (Line: 87)
       if (options.preventUpdate !== true && element.on && isFunction(element.on.update)) {

package/utils/extendUtils.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, isFunction, isObject, isString } from '@domql/utils'
+import { isArray, isFunction, isObject, isString, deepCloneWithExtend } from '@domql/utils'
 const ENV = process.env.NODE_ENV
 
 export const generateHash = () => Math.random().toString(36).substring(2)
@@ -48,21 +48,6 @@ export const flattenExtend = (extend, stack, context) => {
   return stack
 }
 
-// merging
-export const deepCloneExtend = obj => {
-  const o = {}
-  for (const prop in obj) {
-    if (['parent', 'node', '__element'].indexOf(prop) > -1) continue
-    const objProp = obj[prop]
-    if (isObject(objProp)) {
-      o[prop] = deepCloneExtend(objProp)
-    } else if (isArray(objProp)) {
-      o[prop] = objProp.map(x => x)
-    } else o[prop] = objProp
-  }
-  return o
-}
-
 export const deepMergeExtend = (element, extend) => {
   for (const e in extend) {
     if (['parent', 'node', '__element'].indexOf(e) > -1) continue
@@ -86,7 +71,7 @@ export const deepMergeExtend = (element, extend) => {
 
 export const cloneAndMergeArrayExtend = stack => {
   return stack.reduce((a, c) => {
-    return deepMergeExtend(a, deepCloneExtend(c))
+    return deepMergeExtend(a, deepCloneWithExtend(c))
   }, {})
 }