@domql/element 2.5.151 → 2.5.152

package/dist/cjs/methods/index.js

@@ -166,7 +166,7 @@ function keys() {
   const element = this;
   const keys2 = [];
   for (const param in element) {
-    if (import_mixins.registry[param] && !import_mixins.parseFilters.elementKeys.includes(param) || Object.hasOwnProperty.call(element, param)) {
+    if (import_mixins.registry[param] && !import_mixins.parseFilters.elementKeys.includes(param) || !Object.hasOwnProperty.call(element, param)) {
       continue;
     }
     keys2.push(param);

package/dist/cjs/set.js

@@ -66,17 +66,19 @@ const set = function(params, options = {}, el) {
   const content = (0, import_utils.setContentKey)(element, options);
   const __contentRef = content && content.__ref;
   const lazyLoad = element.props && element.props.lazyLoad;
-  if (!options.preventBeforeUpdateListener && !options.preventListeners) {
-    const beforeUpdateReturns = (0, import_event.triggerEventOnUpdate)("beforeUpdate", params, element, options);
-    if (beforeUpdateReturns === false)
-      return element;
-  }
   const hasCollection = element.$collection || element.$stateCollection || element.$propsCollection;
   if (options.preventContentUpdate === true && !hasCollection)
     return;
   if (ref.__noCollectionDifference || __contentRef && __contentRef.__cached && (0, import_utils.deepContains)(params, content)) {
+    if (!options.preventBeforeUpdateListener && !options.preventListeners) {
+      const beforeUpdateReturns = (0, import_event.triggerEventOnUpdate)("beforeUpdate", params, element, options);
+      if (beforeUpdateReturns === false)
+        return element;
+    }
     if (content == null ? void 0 : content.update)
       content.update();
+    if (!options.preventUpdateListener)
+      (0, import_event.triggerEventOn)("update", element, options);
     return;
   }
   if (params) {
@@ -93,8 +95,6 @@ const set = function(params, options = {}, el) {
     } else
       resetElement(params, element, options);
   }
-  if (!options.preventUpdateListener)
-    (0, import_event.triggerEventOn)("update", element, options);
   return element;
 };
 var set_default = set;

package/methods/index.js

@@ -136,7 +136,7 @@ export function keys () {
   const element = this
   const keys = []
   for (const param in element) {
-    if ((registry[param] && !parseFilters.elementKeys.includes(param)) || Object.hasOwnProperty.call(element, param)) { continue }
+    if ((registry[param] && !parseFilters.elementKeys.includes(param)) || !Object.hasOwnProperty.call(element, param)) { continue }
     keys.push(param)
   }
   return keys

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.151",
+  "version": "2.5.152",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -26,12 +26,12 @@
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.5.151",
-    "@domql/render": "^2.5.151",
-    "@domql/state": "^2.5.151",
-    "@domql/utils": "^2.5.151"
+    "@domql/event": "^2.5.152",
+    "@domql/render": "^2.5.152",
+    "@domql/state": "^2.5.152",
+    "@domql/utils": "^2.5.152"
   },
-  "gitHead": "f37b51f84b8bca80b8bce7887e83d61ac25eb3d5",
+  "gitHead": "249d2545f3ee35b450ca90d399fc7c3e54a4a7bc",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/set.js

@@ -37,16 +37,16 @@ const set = function (params, options = {}, el) {
   const __contentRef = content && content.__ref
   const lazyLoad = element.props && element.props.lazyLoad
 
-  if (!options.preventBeforeUpdateListener && !options.preventListeners) {
-    const beforeUpdateReturns = triggerEventOnUpdate('beforeUpdate', params, element, options)
-    if (beforeUpdateReturns === false) return element
-  }
-
   const hasCollection = element.$collection || element.$stateCollection || element.$propsCollection
   if (options.preventContentUpdate === true && !hasCollection) return
 
   if (ref.__noCollectionDifference || (__contentRef && __contentRef.__cached && deepContains(params, content))) {
+    if (!options.preventBeforeUpdateListener && !options.preventListeners) {
+      const beforeUpdateReturns = triggerEventOnUpdate('beforeUpdate', params, element, options)
+      if (beforeUpdateReturns === false) return element
+    }
     if (content?.update) content.update()
+    if (!options.preventUpdateListener) triggerEventOn('update', element, options)
     return
   }
 
@@ -63,8 +63,6 @@ const set = function (params, options = {}, el) {
     } else resetElement(params, element, options)
   }
 
-  if (!options.preventUpdateListener) triggerEventOn('update', element, options)
-
   return element
 }