@symbo.ls/fetch 3.5.1 → 3.6.1

package/dist/iife/index.js

@@ -266,7 +266,7 @@ var SmblsFetch = (() => {
     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
@@ -1595,6 +1595,7 @@ var SmblsFetch = (() => {
 
   // ../utils/dist/esm/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);
@@ -1669,17 +1670,17 @@ var SmblsFetch = (() => {
     }
     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;
@@ -1691,26 +1692,32 @@ var SmblsFetch = (() => {
     }
     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;
   };
@@ -1723,7 +1730,7 @@ var SmblsFetch = (() => {
     "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;
@@ -1733,11 +1740,23 @@ var SmblsFetch = (() => {
       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") {
@@ -1752,10 +1771,24 @@ var SmblsFetch = (() => {
     }
     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) => {
@@ -1778,11 +1811,12 @@ var SmblsFetch = (() => {
   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) => {
@@ -1889,6 +1923,8 @@ var SmblsFetch = (() => {
     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(
@@ -1899,15 +1935,40 @@ var SmblsFetch = (() => {
         );
       })
     );
-    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);
@@ -1952,6 +2013,30 @@ var SmblsFetch = (() => {
   // ../utils/dist/esm/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 = [];
@@ -1976,7 +2061,7 @@ var SmblsFetch = (() => {
       }
       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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/fetch",
-  "version": "3.5.1",
+  "version": "3.6.1",
   "license": "MIT",
   "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",
   "type": "module",
@@ -11,9 +11,7 @@
   "exports": {
     ".": {
       "import": "./index.js",
-      "require": "./index.js",
-      "browser": "./index.js",
-      "default": "./index.js"
+      "require": "./index.js"
     }
   },
   "source": "index.js",
@@ -30,8 +28,11 @@
     "prepublish": "npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/utils": "^3.5.1"
+    "@domql/utils": "^3.6.1"
   },
   "browser": "./dist/esm/index.js",
-  "sideEffects": false
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  }
 }