@domql/utils 3.5.0 → 3.6.1

package/dist/esm/triggerEvent.js

@@ -9,18 +9,26 @@ const getOnOrPropsEvent = (param, element) => {
 };
 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;
 };
 const triggerEventOn = (param, element, options) => {
   if (!element) {
@@ -34,19 +42,27 @@ const triggerEventOn = (param, element, options) => {
 };
 const applyEventUpdate = (param, updatedObj, element, state, context, 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;
 };
 const triggerEventOnUpdate = (param, updatedObj, element, options) => {
   const appliedFunction = getOnOrPropsEvent(param, element);

package/dist/iife/index.js

@@ -257,7 +257,7 @@ var DomqlUtils = (() => {
     return (typeof HTMLElement === "object" ? obj instanceof window2.HTMLElement : obj && typeof obj === "object" && obj !== null && obj.nodeType === 1 && typeof obj.nodeName === "string") || false;
   };
   var isDOMNode = (obj) => {
-    return typeof window2 !== "undefined" && (obj instanceof window2.Node || obj instanceof window2.Window || obj === window2 || obj === document);
+    return typeof window2 !== "undefined" && (window2.Node && obj instanceof window2.Node || window2.Window && obj instanceof window2.Window || obj === window2 || obj === document);
   };
 
   // types.js
@@ -1586,6 +1586,7 @@ var DomqlUtils = (() => {
 
   // extends.js
   var ENV3 = process.env.NODE_ENV;
+  var isSourcemapEnabled = (options) => options.sourcemap !== false && ENV3 !== "production";
   var createExtendsFromKeys = (key) => {
     if (key.includes("+")) {
       return key.split("+").filter(matchesComponentNaming);
@@ -1660,17 +1661,17 @@ var DomqlUtils = (() => {
     }
     return setHashedExtend(extend, stack);
   };
-  var extractArrayExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set()) => {
+  var extractArrayExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set(), nameStack, componentNameMap) => {
     for (const each of extend) {
       if (isArray(each)) {
-        extractArrayExtend(each, stack, context, processed);
+        extractArrayExtend(each, stack, context, processed, nameStack, componentNameMap);
       } else {
-        flattenExtend(each, stack, context, processed);
+        flattenExtend(each, stack, context, processed, nameStack, void 0, componentNameMap);
       }
     }
     return stack;
   };
-  var deepExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set()) => {
+  var deepExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set(), nameStack, currentName, componentNameMap) => {
     const extendOflattenExtend = extend.extends || extend.extend;
     const cleanExtend = { ...extend };
     delete cleanExtend.extends;
@@ -1682,26 +1683,32 @@ var DomqlUtils = (() => {
     }
     if (hasKeys) {
       stack.push(cleanExtend);
+      if (nameStack) nameStack.push(currentName);
     }
     if (extendOflattenExtend) {
-      flattenExtend(extendOflattenExtend, stack, context, processed);
+      flattenExtend(extendOflattenExtend, stack, context, processed, nameStack, currentName, componentNameMap);
     }
     return stack;
   };
-  var flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set()) => {
+  var flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set(), nameStack, parentName, componentNameMap) => {
     if (!extend) return stack;
     if (processed.has(extend)) return stack;
     if (isArray(extend)) {
-      return extractArrayExtend(extend, stack, context, processed);
+      return extractArrayExtend(extend, stack, context, processed, nameStack, componentNameMap);
     }
+    let currentName = parentName;
     if (isString(extend)) {
+      currentName = extend;
       extend = mapStringsWithContextComponents(extend, context);
+    } else if (componentNameMap && isObject(extend) && componentNameMap.has(extend)) {
+      currentName = componentNameMap.get(extend);
     }
     processed.add(extend);
     if (extend?.extends || extend?.extend) {
-      deepExtend(extend, stack, context, processed);
+      deepExtend(extend, stack, context, processed, nameStack, currentName, componentNameMap);
     } else if (extend) {
       stack.push(extend);
+      if (nameStack) nameStack.push(currentName);
     }
     return stack;
   };
@@ -1714,7 +1721,7 @@ var DomqlUtils = (() => {
     "childExtend",
     "childExtendRecursive"
   ]);
-  var deepMergeExtends = (element, extend) => {
+  var deepMergeExtends = (element, extend, sourcemap, sourceName, preBuiltSourcemap) => {
     extend = deepClone(extend);
     for (const e in extend) {
       if (MERGE_EXTENDS_SKIP.has(e)) continue;
@@ -1724,11 +1731,23 @@ var DomqlUtils = (() => {
       if (Object.prototype.hasOwnProperty.call(extend, e) && e !== "__proto__" && e !== "constructor" && e !== "prototype") {
         if (elementProp === void 0) {
           element[e] = extendProp;
+          if (sourcemap && sourceName) {
+            if (isObject(extendProp) && !isArray(extendProp)) {
+              sourcemap[e] = sourcemap[e] || {};
+              trackSourcemapDeep(sourcemap[e], extendProp, sourceName);
+            } else {
+              sourcemap[e] = sourceName;
+            }
+          } else if (sourcemap && preBuiltSourcemap?.[e]) {
+            sourcemap[e] = preBuiltSourcemap[e];
+          }
         } else if (isObject(elementProp) && isObject(extendProp)) {
+          const nestedSourcemap = sourcemap ? sourcemap[e] = sourcemap[e] || {} : void 0;
+          const nestedPreBuilt = preBuiltSourcemap?.[e];
           if (matchesComponentNaming(e)) {
-            element[e] = deepMergeExtends(elementProp, extendProp);
+            element[e] = deepMergeExtends(elementProp, extendProp, nestedSourcemap, sourceName, nestedPreBuilt);
           } else {
-            deepMergeExtends(elementProp, extendProp);
+            deepMergeExtends(elementProp, extendProp, nestedSourcemap, sourceName, nestedPreBuilt);
           }
         }
         if (e === "extends" || e === "childExtends" || e === "childExtendsRecursive") {
@@ -1743,10 +1762,24 @@ var DomqlUtils = (() => {
     }
     return element;
   };
-  var cloneAndMergeArrayExtend = (stack) => {
-    return stack.reduce((acc, current) => {
+  var trackSourcemapDeep = (sourcemap, obj, sourceName) => {
+    for (const key in obj) {
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
+      if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
+      const val = obj[key];
+      if (isObject(val) && !isArray(val)) {
+        sourcemap[key] = sourcemap[key] || {};
+        trackSourcemapDeep(sourcemap[key], val, sourceName);
+      } else {
+        sourcemap[key] = sourceName;
+      }
+    }
+  };
+  var cloneAndMergeArrayExtend = (stack, sourcemap, extendNames) => {
+    return stack.reduce((acc, current, i) => {
       const cloned = deepClone(current);
-      return deepMergeExtends(acc, cloned);
+      const sourceName = extendNames ? extendNames[i] : void 0;
+      return deepMergeExtends(acc, cloned, sourcemap, sourceName);
     }, {});
   };
   var mapStringsWithContextComponents = (extend, context, options = {}, variant) => {
@@ -1769,11 +1802,12 @@ var DomqlUtils = (() => {
   var jointStacks = (extendStack, childExtendsStack) => {
     return [].concat(extendStack.slice(0, 1)).concat(childExtendsStack.slice(0, 1)).concat(extendStack.slice(1)).concat(childExtendsStack.slice(1));
   };
-  var getExtendsStack = (extend, context) => {
+  var getExtendsStack = (extend, context, nameStack, componentNameMap) => {
     if (!extend) return [];
     if (extend.__hash) return getHashedExtend(extend) || [];
     const processed = /* @__PURE__ */ new Set();
-    const stack = flattenExtend(extend, [], context, processed);
+    const stack = flattenExtend(extend, [], context, processed, nameStack, void 0, componentNameMap);
+    if (nameStack) return stack;
     return getExtendsStackRegistry(extend, stack);
   };
   var addExtend = (newExtends, elementExtends) => {
@@ -1880,6 +1914,8 @@ var DomqlUtils = (() => {
     const { props, __ref: ref } = element;
     const context = element.context || parent.context;
     const variant = element.variant || props?.variant;
+    const sourcemap = isSourcemapEnabled(options);
+    const originalExtendNames = sourcemap ? [...ref.__extends] : null;
     const __extends = removeDuplicatesInArray(
       ref.__extends.map((val, i) => {
         return mapStringsWithContextComponents(
@@ -1890,15 +1926,40 @@ var DomqlUtils = (() => {
         );
       })
     );
-    const stack = getExtendsStack(__extends, context);
-    ref.__extendsStack = stack;
+    if (sourcemap) {
+      const componentNameMap = /* @__PURE__ */ new WeakMap();
+      for (let i = 0; i < __extends.length; i++) {
+        const resolved = __extends[i];
+        const originalName = originalExtendNames[i];
+        if (resolved && isObject(resolved) && isString(originalName)) {
+          componentNameMap.set(resolved, originalName);
+        }
+      }
+      const nameStack = [];
+      const stack = getExtendsStack(__extends, context, nameStack, componentNameMap);
+      ref.__extendsStack = stack;
+      ref.__extendsNames = nameStack;
+    } else {
+      const stack = getExtendsStack(__extends, context);
+      ref.__extendsStack = stack;
+    }
     return ref.__extendsStack;
   };
   var finalizeExtends = (element, parent, options = {}) => {
     const { __ref: ref } = element;
     const { __extendsStack } = ref;
-    const flattenExtends = cloneAndMergeArrayExtend(__extendsStack);
-    return deepMergeExtends(element, flattenExtends);
+    if (isSourcemapEnabled(options)) {
+      const sourcemapAcc = {};
+      const extendNames = ref.__extendsNames || [];
+      const flattenExtends = cloneAndMergeArrayExtend(__extendsStack, sourcemapAcc, extendNames);
+      const appliedSourcemap = {};
+      deepMergeExtends(element, flattenExtends, appliedSourcemap, void 0, sourcemapAcc);
+      ref.__sourcemap = appliedSourcemap;
+    } else {
+      const flattenExtends = cloneAndMergeArrayExtend(__extendsStack);
+      deepMergeExtends(element, flattenExtends);
+    }
+    return element;
   };
   var applyExtends = (element, parent, options = {}) => {
     createElementExtends(element, parent, options);
@@ -1943,6 +2004,30 @@ var DomqlUtils = (() => {
   // props.js
   var RE_UPPER = /^[A-Z]/;
   var RE_DIGITS = /^\d+$/;
+  var ELEMENT_INDICATOR_KEYS = /* @__PURE__ */ new Set([
+    "extend",
+    "props",
+    "text",
+    "tag",
+    "on",
+    "if",
+    "childExtend",
+    "children",
+    "childrenAs",
+    "state",
+    "html",
+    "attr",
+    "define",
+    "content"
+  ]);
+  var 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;
+  };
   var createProps = (element, parent, key) => {
     const { props, __ref: ref } = element;
     ref.__propsStack = [];
@@ -1967,7 +2052,7 @@ var DomqlUtils = (() => {
       }
       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 (!isElement && !isBuiltin && !hasDefine && !hasGlobalDefine) {
         obj.props[key] = value;
@@ -2392,18 +2477,26 @@ var DomqlUtils = (() => {
   };
   var 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;
   };
   var triggerEventOn = (param, element, options) => {
     if (!element) {
@@ -2417,19 +2510,27 @@ var DomqlUtils = (() => {
   };
   var applyEventUpdate = (param, updatedObj, element, state, context, 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;
   };
   var triggerEventOnUpdate = (param, updatedObj, element, options) => {
     const appliedFunction = getOnOrPropsEvent(param, element);
@@ -2745,7 +2846,20 @@ var DomqlUtils = (() => {
   }
   function call(fnKey, ...args) {
     const context = this.context;
-    return (context.utils?.[fnKey] || context.functions?.[fnKey] || context.methods?.[fnKey] || context.snippets?.[fnKey])?.call(this, ...args);
+    const fn = context.utils?.[fnKey] || context.functions?.[fnKey] || context.methods?.[fnKey] || context.snippets?.[fnKey];
+    if (!fn) return;
+    try {
+      const result = fn.call(this, ...args);
+      if (result && typeof result.then === "function") {
+        result.catch((err) => {
+          this.error = err;
+        });
+      }
+      return result;
+    } catch (err) {
+      this.error = err;
+      if (context?.strictMode) throw err;
+    }
   }
   function isMethod(param, element) {
     return Boolean(METHODS.has(param) || element?.context?.methods?.[param]);

package/extends.js

@@ -5,6 +5,7 @@ import { matchesComponentNaming } from './component.js'
 import { deepClone, exec } from './object.js'
 import { isArray, isObject, isString } from './types.js'
 const ENV = process.env.NODE_ENV
+const isSourcemapEnabled = (options) => options.sourcemap !== false && ENV !== 'production'
 
 export const createExtendsFromKeys = key => {
   if (key.includes('+')) {
@@ -112,19 +113,21 @@ export const extractArrayExtend = (
   extend,
   stack,
   context,
-  processed = new Set()
+  processed = new Set(),
+  nameStack,
+  componentNameMap
 ) => {
   for (const each of extend) {
     if (isArray(each)) {
-      extractArrayExtend(each, stack, context, processed)
+      extractArrayExtend(each, stack, context, processed, nameStack, componentNameMap)
     } else {
-      flattenExtend(each, stack, context, processed)
+      flattenExtend(each, stack, context, processed, nameStack, undefined, componentNameMap)
     }
   }
   return stack
 }
 
-export const deepExtend = (extend, stack, context, processed = new Set()) => {
+export const deepExtend = (extend, stack, context, processed = new Set(), nameStack, currentName, componentNameMap) => {
   const extendOflattenExtend = extend.extends || extend.extend
   // Remove extends/extend properties before adding to stack
   const cleanExtend = { ...extend }
@@ -134,9 +137,10 @@ export const deepExtend = (extend, stack, context, processed = new Set()) => {
   for (const _k in cleanExtend) { hasKeys = true; break } // eslint-disable-line
   if (hasKeys) {
     stack.push(cleanExtend)
+    if (nameStack) nameStack.push(currentName)
   }
   if (extendOflattenExtend) {
-    flattenExtend(extendOflattenExtend, stack, context, processed)
+    flattenExtend(extendOflattenExtend, stack, context, processed, nameStack, currentName, componentNameMap)
   }
   return stack
 }
@@ -145,25 +149,34 @@ export const flattenExtend = (
   extend,
   stack,
   context,
-  processed = new Set()
+  processed = new Set(),
+  nameStack,
+  parentName,
+  componentNameMap
 ) => {
   if (!extend) return stack
   if (processed.has(extend)) return stack
 
   if (isArray(extend)) {
-    return extractArrayExtend(extend, stack, context, processed)
+    return extractArrayExtend(extend, stack, context, processed, nameStack, componentNameMap)
   }
 
+  let currentName = parentName
   if (isString(extend)) {
+    currentName = extend
     extend = mapStringsWithContextComponents(extend, context)
+  } else if (componentNameMap && isObject(extend) && componentNameMap.has(extend)) {
+    // Resolve name from pre-built map (top-level resolved extends)
+    currentName = componentNameMap.get(extend)
   }
 
   processed.add(extend)
 
   if (extend?.extends || extend?.extend) {
-    deepExtend(extend, stack, context, processed)
+    deepExtend(extend, stack, context, processed, nameStack, currentName, componentNameMap)
   } else if (extend) {
     stack.push(extend)
+    if (nameStack) nameStack.push(currentName)
   }
 
   return stack
@@ -173,7 +186,7 @@ const MERGE_EXTENDS_SKIP = new Set([
   'parent', 'node', '__ref', '__proto__', 'extend', 'childExtend', 'childExtendRecursive'
 ])
 
-export const deepMergeExtends = (element, extend) => {
+export const deepMergeExtends = (element, extend, sourcemap, sourceName, preBuiltSourcemap) => {
   // Clone extend to prevent mutations
   extend = deepClone(extend)
 
@@ -194,14 +207,28 @@ export const deepMergeExtends = (element, extend) => {
       if (elementProp === undefined) {
         // For undefined properties in element, copy from extend
         element[e] = extendProp
+        // Track sourcemap for this property
+        if (sourcemap && sourceName) {
+          if (isObject(extendProp) && !isArray(extendProp)) {
+            sourcemap[e] = sourcemap[e] || {}
+            trackSourcemapDeep(sourcemap[e], extendProp, sourceName)
+          } else {
+            sourcemap[e] = sourceName
+          }
+        } else if (sourcemap && preBuiltSourcemap?.[e]) {
+          // Copy sourcemap entry from pre-built sourcemap (used in finalizeExtends)
+          sourcemap[e] = preBuiltSourcemap[e]
+        }
       } else if (isObject(elementProp) && isObject(extendProp)) {
         // For objects, merge based on type
+        const nestedSourcemap = sourcemap ? (sourcemap[e] = sourcemap[e] || {}) : undefined
+        const nestedPreBuilt = preBuiltSourcemap?.[e]
         if (matchesComponentNaming(e)) {
           // For components, override base properties with extended ones
-          element[e] = deepMergeExtends(elementProp, extendProp)
+          element[e] = deepMergeExtends(elementProp, extendProp, nestedSourcemap, sourceName, nestedPreBuilt)
         } else {
           // For other objects, merge normally
-          deepMergeExtends(elementProp, extendProp)
+          deepMergeExtends(elementProp, extendProp, nestedSourcemap, sourceName, nestedPreBuilt)
         }
       }
 
@@ -225,12 +252,27 @@ export const deepMergeExtends = (element, extend) => {
   return element
 }
 
-export const cloneAndMergeArrayExtend = stack => {
-  return stack.reduce((acc, current) => {
+const trackSourcemapDeep = (sourcemap, obj, sourceName) => {
+  for (const key in obj) {
+    if (!Object.prototype.hasOwnProperty.call(obj, key)) continue
+    if (key === '__proto__' || key === 'constructor' || key === 'prototype') continue
+    const val = obj[key]
+    if (isObject(val) && !isArray(val)) {
+      sourcemap[key] = sourcemap[key] || {}
+      trackSourcemapDeep(sourcemap[key], val, sourceName)
+    } else {
+      sourcemap[key] = sourceName
+    }
+  }
+}
+
+export const cloneAndMergeArrayExtend = (stack, sourcemap, extendNames) => {
+  return stack.reduce((acc, current, i) => {
     // Clone current extend to avoid mutations
     const cloned = deepClone(current)
+    const sourceName = extendNames ? extendNames[i] : undefined
     // Merge into accumulator, giving priority to current extend
-    return deepMergeExtends(acc, cloned)
+    return deepMergeExtends(acc, cloned, sourcemap, sourceName)
   }, {})
 }
 
@@ -271,11 +313,12 @@ export const jointStacks = (extendStack, childExtendsStack) => {
 }
 
 // init
-export const getExtendsStack = (extend, context) => {
+export const getExtendsStack = (extend, context, nameStack, componentNameMap) => {
   if (!extend) return []
   if (extend.__hash) return getHashedExtend(extend) || []
   const processed = new Set()
-  const stack = flattenExtend(extend, [], context, processed)
+  const stack = flattenExtend(extend, [], context, processed, nameStack, undefined, componentNameMap)
+  if (nameStack) return stack
   return getExtendsStackRegistry(extend, stack)
 }
 
@@ -416,6 +459,10 @@ export const createExtendsStack = (element, parent, options = {}) => {
 
   const variant = element.variant || props?.variant
 
+  // Keep original string names before resolution for sourcemap tracking
+  const sourcemap = isSourcemapEnabled(options)
+  const originalExtendNames = sourcemap ? [...ref.__extends] : null
+
   const __extends = removeDuplicatesInArray(
     ref.__extends.map((val, i) => {
       return mapStringsWithContextComponents(
@@ -427,8 +474,24 @@ export const createExtendsStack = (element, parent, options = {}) => {
     })
   )
 
-  const stack = getExtendsStack(__extends, context)
-  ref.__extendsStack = stack
+  if (sourcemap) {
+    // Build a map from resolved component objects to their original string names
+    const componentNameMap = new WeakMap()
+    for (let i = 0; i < __extends.length; i++) {
+      const resolved = __extends[i]
+      const originalName = originalExtendNames[i]
+      if (resolved && isObject(resolved) && isString(originalName)) {
+        componentNameMap.set(resolved, originalName)
+      }
+    }
+    const nameStack = []
+    const stack = getExtendsStack(__extends, context, nameStack, componentNameMap)
+    ref.__extendsStack = stack
+    ref.__extendsNames = nameStack
+  } else {
+    const stack = getExtendsStack(__extends, context)
+    ref.__extendsStack = stack
+  }
 
   return ref.__extendsStack
 }
@@ -436,9 +499,21 @@ export const createExtendsStack = (element, parent, options = {}) => {
 export const finalizeExtends = (element, parent, options = {}) => {
   const { __ref: ref } = element
   const { __extendsStack } = ref
-  const flattenExtends = cloneAndMergeArrayExtend(__extendsStack)
 
-  return deepMergeExtends(element, flattenExtends)
+  if (isSourcemapEnabled(options)) {
+    const sourcemapAcc = {}
+    const extendNames = ref.__extendsNames || []
+    const flattenExtends = cloneAndMergeArrayExtend(__extendsStack, sourcemapAcc, extendNames)
+    // Only keep sourcemap entries for properties actually merged into element
+    const appliedSourcemap = {}
+    deepMergeExtends(element, flattenExtends, appliedSourcemap, undefined, sourcemapAcc)
+    ref.__sourcemap = appliedSourcemap
+  } else {
+    const flattenExtends = cloneAndMergeArrayExtend(__extendsStack)
+    deepMergeExtends(element, flattenExtends)
+  }
+
+  return element
 }
 
 export const applyExtends = (element, parent, options = {}) => {

package/methods.js

@@ -377,12 +377,25 @@ export function variables (obj = {}) {
  */
 export function call (fnKey, ...args) {
   const context = this.context
-  return (
+  const fn = (
     context.utils?.[fnKey] ||
     context.functions?.[fnKey] ||
     context.methods?.[fnKey] ||
     context.snippets?.[fnKey]
-  )?.call(this, ...args)
+  )
+  if (!fn) return
+  try {
+    const result = fn.call(this, ...args)
+    if (result && typeof result.then === 'function') {
+      result.catch((err) => {
+        this.error = err
+      })
+    }
+    return result
+  } catch (err) {
+    this.error = err
+    if (context?.strictMode) throw err
+  }
 }
 
 export function isMethod (param, element) {