@domql/utils 3.5.0 → 3.6.1

package/node.js

@@ -29,8 +29,8 @@ export const isHtmlElement = obj => {
 export const isDOMNode = obj => {
   return (
     typeof window !== 'undefined' &&
-    (obj instanceof window.Node ||
-      obj instanceof window.Window ||
+    ((window.Node && obj instanceof window.Node) ||
+      (window.Window && obj instanceof window.Window) ||
       obj === window ||
       obj === document)
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "license": "MIT",
   "type": "module",
   "module": "./dist/esm/index.js",
@@ -8,24 +8,19 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "browser": "./dist/esm/index.js",
-      "default": "./dist/esm/index.js"
+      "require": "./dist/cjs/index.js"
     },
     "./methods": {
       "import": "./dist/esm/methods.js",
-      "require": "./dist/cjs/methods.js",
-      "default": "./dist/esm/methods.js"
+      "require": "./dist/cjs/methods.js"
     },
     "./*.js": {
       "import": "./dist/esm/*.js",
-      "require": "./dist/cjs/*.js",
-      "default": "./dist/esm/*.js"
+      "require": "./dist/cjs/*.js"
     },
     "./*": {
       "import": "./dist/esm/*.js",
-      "require": "./dist/cjs/*.js",
-      "default": "./dist/esm/*.js"
+      "require": "./dist/cjs/*.js"
     }
   },
   "source": "index.js",
@@ -48,5 +43,8 @@
   "browser": "./dist/esm/index.js",
   "unpkg": "./dist/iife/index.js",
   "jsdelivr": "./dist/iife/index.js",
-  "sideEffects": false
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/props.js

@@ -9,6 +9,20 @@ import { lowercaseFirstLetter } from './string.js'
 const RE_UPPER = /^[A-Z]/
 const RE_DIGITS = /^\d+$/
 
+const ELEMENT_INDICATOR_KEYS = new Set([
+  'extend', 'props', 'text', 'tag', 'on', 'if', 'childExtend',
+  'children', 'childrenAs', 'state', 'html', 'attr',
+  'define', 'content'
+])
+const looksLikeElement = (value) => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false
+  for (const k in value) {
+    if (ELEMENT_INDICATOR_KEYS.has(k)) return true
+    if (RE_UPPER.test(k)) return true
+  }
+  return false
+}
+
 export const createProps = (element, parent, key) => {
   const { props, __ref: ref } = element
   ref.__propsStack = []
@@ -38,7 +52,7 @@ export function pickupPropsFromElement (obj, opts = {}) {
 
     const hasDefine = isObject(this.define?.[key])
     const hasGlobalDefine = isObject(this.context?.define?.[key])
-    const isElement = RE_UPPER.test(key) || RE_DIGITS.test(key)
+    const isElement = RE_UPPER.test(key) || RE_DIGITS.test(key) || looksLikeElement(value)
     const isBuiltin = DOMQ_PROPERTIES.has(key)
 
     // If it's not a special case, move to props

package/triggerEvent.js

@@ -13,17 +13,26 @@ const getOnOrPropsEvent = (param, element) => {
 
 export const applyEvent = (param, element, state, context, options) => {
   if (!isFunction(param)) return
-  const result = param.call(
-    element,
-    element,
-    state || element.state,
-    context || element.context,
-    options
-  )
-  if (result && typeof result.then === 'function') {
-    result.catch(() => {})
+  try {
+    const result = param.call(
+      element,
+      element,
+      state || element.state,
+      context || element.context,
+      options
+    )
+    if (result && typeof result.then === 'function') {
+      result.catch((err) => {
+        element.error = err
+        console.error('[DomQL] Async event error:', err)
+      })
+    }
+    return result
+  } catch (err) {
+    element.error = err
+    console.error('[DomQL] Event handler error:', err)
+    if (element.context?.strictMode) throw err
   }
-  return result
 }
 
 export const triggerEventOn = (param, element, options) => {
@@ -46,18 +55,27 @@ export const applyEventUpdate = (
   options
 ) => {
   if (!isFunction(param)) return
-  const result = param.call(
-    element,
-    updatedObj,
-    element,
-    state || element.state,
-    context || element.context,
-    options
-  )
-  if (result && typeof result.then === 'function') {
-    result.catch(() => {})
+  try {
+    const result = param.call(
+      element,
+      updatedObj,
+      element,
+      state || element.state,
+      context || element.context,
+      options
+    )
+    if (result && typeof result.then === 'function') {
+      result.catch((err) => {
+        element.error = err
+        console.error('[DomQL] Async event update error:', err)
+      })
+    }
+    return result
+  } catch (err) {
+    element.error = err
+    console.error('[DomQL] Event update error:', err)
+    if (element.context?.strictMode) throw err
   }
-  return result
 }
 
 export const triggerEventOnUpdate = (param, updatedObj, element, options) => {