domql 3.5.1 → 3.6.3

package/dist/iife/index.js

@@ -36,7 +36,7 @@ var Domql = (() => {
     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);
   };
 
   // ../utils/dist/esm/types.js
@@ -780,6 +780,7 @@ var Domql = (() => {
 
   // ../utils/dist/esm/extends.js
   var ENV2 = process.env.NODE_ENV;
+  var isSourcemapEnabled = (options) => options.sourcemap !== false && ENV2 !== "production";
   var createExtendsFromKeys = (key) => {
     if (key.includes("+")) {
       return key.split("+").filter(matchesComponentNaming);
@@ -853,17 +854,17 @@ var Domql = (() => {
     }
     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;
@@ -875,26 +876,32 @@ var Domql = (() => {
     }
     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;
   };
@@ -907,7 +914,7 @@ var Domql = (() => {
     "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;
@@ -917,11 +924,23 @@ var Domql = (() => {
       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") {
@@ -936,10 +955,24 @@ var Domql = (() => {
     }
     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) => {
@@ -959,11 +992,12 @@ var Domql = (() => {
     }
     return extend;
   };
-  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 createElementExtends = (element, parent, options = {}) => {
@@ -1041,6 +1075,8 @@ var Domql = (() => {
     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(
@@ -1051,15 +1087,40 @@ var Domql = (() => {
         );
       })
     );
-    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);
@@ -1098,6 +1159,31 @@ var Domql = (() => {
   // ../utils/dist/esm/props.js
   var RE_UPPER = /^[A-Z]/;
   var RE_DIGITS = /^\d+$/;
+  var CSS_SELECTOR_PREFIXES = /* @__PURE__ */ new Set([":", "@", "[", "*", "+", "~", "&", ">", "$", "-", ".", "!"]);
+  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 = [];
@@ -1120,11 +1206,27 @@ var Domql = (() => {
         delete obj[key];
         continue;
       }
-      const hasDefine = isObject(this.define?.[key]);
-      const hasGlobalDefine = isObject(this.context?.define?.[key]);
-      const isElement = RE_UPPER.test(key) || RE_DIGITS.test(key);
+      if (key === "childProps") {
+        obj.props[key] = value;
+        delete obj[key];
+        cachedKeys.push(key);
+        continue;
+      }
+      const defineValue = this.define?.[key];
+      const globalDefineValue = this.context?.define?.[key];
+      const hasDefine = isObject(defineValue) || isFunction(defineValue);
+      const hasGlobalDefine = isObject(globalDefineValue) || isFunction(globalDefineValue);
+      if (hasDefine || hasGlobalDefine) continue;
+      const firstChar = key.charAt(0);
+      if (CSS_SELECTOR_PREFIXES.has(firstChar)) {
+        obj.props[key] = value;
+        delete obj[key];
+        cachedKeys.push(key);
+        continue;
+      }
+      const isElement = RE_UPPER.test(key) || RE_DIGITS.test(key) || looksLikeElement(value);
       const isBuiltin = DOMQ_PROPERTIES.has(key);
-      if (!isElement && !isBuiltin && !hasDefine && !hasGlobalDefine) {
+      if (!isElement && !isBuiltin) {
         obj.props[key] = value;
         delete obj[key];
         cachedKeys.push(key);
@@ -1144,8 +1246,13 @@ var Domql = (() => {
         continue;
       }
       if (cachedKeys.includes(key)) continue;
-      const hasDefine = isObject(this.define?.[key]);
-      const hasGlobalDefine = isObject(this.context?.define?.[key]);
+      if (key === "childProps") continue;
+      const firstChar = key.charAt(0);
+      if (CSS_SELECTOR_PREFIXES.has(firstChar)) continue;
+      const defineValue = this.define?.[key];
+      const globalDefineValue = this.context?.define?.[key];
+      const hasDefine = isObject(defineValue) || isFunction(defineValue);
+      const hasGlobalDefine = isObject(globalDefineValue) || isFunction(globalDefineValue);
       const isElement = RE_UPPER.test(key) || RE_DIGITS.test(key);
       const isBuiltin = DOMQ_PROPERTIES.has(key);
       if (isElement || isBuiltin || hasDefine || hasGlobalDefine) {
@@ -1180,7 +1287,7 @@ var Domql = (() => {
     const parentProps = parent.props;
     if (!parentProps) return propsStack;
     const matchParentKeyProps = parentProps[element.key];
-    const matchParentChildProps = parentProps.childProps;
+    const matchParentChildProps = parentProps.childProps || parent.childProps;
     const ignoreChildProps = element.props?.ignoreChildProps;
     if (matchParentChildProps && !ignoreChildProps) {
       const childProps = objectizeStringProperty(matchParentChildProps);
@@ -2130,7 +2237,8 @@ ${element}` : "";
     }
   };
   var startFrameLoop = (frameListeners) => {
-    if (_frameRunning) return;
+    const raf = typeof window !== "undefined" && window.requestAnimationFrame;
+    if (_frameRunning || !raf) return;
     _frameRunning = true;
     function requestFrame() {
       if (frameListeners.size === 0) {
@@ -2138,9 +2246,9 @@ ${element}` : "";
         return;
       }
       processFrameListeners(frameListeners);
-      window.requestAnimationFrame(requestFrame);
+      raf(requestFrame);
     }
-    window.requestAnimationFrame(requestFrame);
+    raf(requestFrame);
   };
   var applyAnimationFrame = (element) => {
     if (!element) {
@@ -2518,7 +2626,7 @@ ${element}` : "";
 
   // ../element/dist/esm/mixins/html.js
   function html(param, element, node) {
-    const prop = exec(element?.props?.html || param, element);
+    const prop = exec(param ?? element?.props?.html, element);
     const { __ref } = element;
     if (prop !== __ref.__html) {
       if (node.nodeName === "SVG") node.textContent = prop;
@@ -2609,7 +2717,9 @@ ${element}` : "";
     extends: {},
     children: {},
     content: {},
+    childExtend: {},
     childExtends: {},
+    childExtendRecursive: {},
     childExtendsRecursive: {},
     props: {},
     if: {},
@@ -2823,6 +2933,16 @@ ${element}` : "";
   };
   var set = function(params, options = {}, el) {
     const element = el || this;
+    const { __ref: ref } = element;
+    if (ref.__settingContent) return element;
+    ref.__settingContent = true;
+    try {
+      return _setInner(params, options, element);
+    } finally {
+      ref.__settingContent = false;
+    }
+  };
+  var _setInner = function(params, options, element) {
     const { __ref: ref } = element;
     const contentElementKey = setContentKey(element, options);
     const content = element[contentElementKey];
@@ -2848,18 +2968,20 @@ ${element}` : "";
       }
       return;
     }
-    if (!params) return element;
+    if (!params || typeof params !== "object") return element;
     let { childExtends, props, tag } = params;
     if (!props) props = params.props = {};
     if (tag === "fragment") {
-      if (!childExtends && element.childExtends) {
-        params.childExtends = element.childExtends;
+      const elementChildExtends = element.childExtends || element.childExtend;
+      if (!childExtends && elementChildExtends) {
+        params.childExtends = elementChildExtends;
         props.ignoreChildExtends = true;
       }
-      if (!props?.childProps && element.props?.childProps) {
-        props.childProps = element.props.childProps;
-        props.ignoreChildProps = true;
+      const elementChildProps = element.childProps || element.props?.childProps;
+      if (!props?.childProps && elementChildProps) {
+        props.childProps = elementChildProps;
       }
+      props.ignoreChildProps = true;
     }
     if (lazyLoad) {
       window.requestAnimationFrame(() => {
@@ -3467,6 +3589,34 @@ ${element}` : "";
       triggerEventOn("update", element, options);
     }
   };
+  var findSiblingAttachOptions = (element, parent) => {
+    const { __children } = parent.__ref || {};
+    if (!__children) return false;
+    const currentIndex = __children.indexOf(element.key);
+    let previousNode;
+    for (let i = currentIndex - 1; i >= 0; i--) {
+      const sibling = parent[__children[i]];
+      if (sibling?.node?.parentNode) {
+        previousNode = sibling.node;
+        break;
+      }
+    }
+    if (previousNode) {
+      return { position: "after", node: previousNode };
+    }
+    let nextNode;
+    for (let i = currentIndex + 1; i < __children.length; i++) {
+      const sibling = parent[__children[i]];
+      if (sibling?.node?.parentNode) {
+        nextNode = sibling.node;
+        break;
+      }
+    }
+    if (nextNode) {
+      return { position: "before", node: nextNode };
+    }
+    return false;
+  };
   var checkIfOnUpdate = (element, parent, options) => {
     if (!isFunction(element.if) && !isFunction(element.props?.if) || !parent) {
       return;
@@ -3503,16 +3653,7 @@ ${element}` : "";
         } else if (element[contentKey]?.parseDeep) {
           element[contentKey] = element[contentKey].parseDeep();
         }
-        const previousElement2 = element.previousElement();
-        const previousNode = previousElement2?.node;
-        const hasPrevious = previousNode?.parentNode;
-        const nextElement2 = element.nextElement();
-        const nextNode = nextElement2?.node;
-        const hasNext = nextNode?.parentNode;
-        const attachOptions = (hasPrevious || hasNext) && {
-          position: hasPrevious ? "after" : hasNext ? "before" : null,
-          node: hasPrevious && previousNode || hasNext && nextNode
-        };
+        const attachOptions = findSiblingAttachOptions(element, parent);
         delete element.__ref;
         delete element.parent;
         const createdElement = create(
@@ -4620,7 +4761,9 @@ ${element}` : "";
   };
   var addElementIntoParentChildren = (element, parent) => {
     if (parent.__ref && parent.__ref.__children) {
-      parent.__ref.__children.push(element.key);
+      if (!parent.__ref.__children.includes(element.key)) {
+        parent.__ref.__children.push(element.key);
+      }
     }
   };
   var _uniqIdCounter = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domql",
-  "version": "3.5.1",
+  "version": "3.6.3",
   "license": "MIT",
   "type": "module",
   "module": "./dist/esm/index.js",
@@ -8,9 +8,7 @@
   "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"
     }
   },
   "source": "index.js",
@@ -27,13 +25,16 @@
     "build:iife": "cross-env NODE_ENV=$NODE_ENV esbuild index.js --bundle --target=es2020 --format=iife --global-name=Domql --outfile=dist/iife/index.js --define:process.env.NODE_ENV=process.env.NODE_ENV"
   },
   "dependencies": {
-    "@domql/element": "^3.5.1",
-    "@domql/state": "^3.5.1",
-    "@domql/utils": "^3.5.1"
+    "@domql/element": "^3.6.3",
+    "@domql/state": "^3.6.3",
+    "@domql/utils": "^3.6.3"
   },
   "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",
   "browser": "./dist/esm/index.js",
   "unpkg": "./dist/iife/index.js",
   "jsdelivr": "./dist/iife/index.js",
-  "sideEffects": false
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  }
 }