@symbo.ls/scratch 2.11.439 → 2.11.446

package/dist/cjs/utils/var.js

@@ -597,6 +597,7 @@ var require_object = __commonJS({
       deepDiff: () => deepDiff,
       deepMerge: () => deepMerge2,
       deepStringify: () => deepStringify,
+      deepStringifyWithMaxDepth: () => deepStringifyWithMaxDepth,
       detachFunctionsFromObject: () => detachFunctionsFromObject,
       detectInfiniteLoop: () => detectInfiniteLoop,
       diff: () => diff,
@@ -630,7 +631,8 @@ var require_object = __commonJS({
     var ENV = "development";
     var exec = (param, element, state, context) => {
       if ((0, import_types.isFunction)(param)) {
-        return param(
+        return param.call(
+          element,
           element,
           state || element.state,
           context || element.context
@@ -747,6 +749,11 @@ var require_object = __commonJS({
       return o;
     };
     var deepStringify = (obj, stringified = {}) => {
+      var _a;
+      if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
+        console.warn("Trying to clone element or state at", obj);
+        obj = (_a = obj.parse) == null ? void 0 : _a.call(obj);
+      }
       for (const prop in obj) {
         const objProp = obj[prop];
         if ((0, import_types.isFunction)(objProp)) {
@@ -772,6 +779,39 @@ var require_object = __commonJS({
       }
       return stringified;
     };
+    var MAX_DEPTH = 100;
+    var deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
+      if (depth > MAX_DEPTH) {
+        console.warn(`Maximum depth exceeded at path: ${path}. Possible circular reference.`);
+        return "[MAX_DEPTH_EXCEEDED]";
+      }
+      for (const prop in obj) {
+        const currentPath = path ? `${path}.${prop}` : prop;
+        const objProp = obj[prop];
+        if ((0, import_types.isFunction)(objProp)) {
+          stringified[prop] = objProp.toString();
+        } else if ((0, import_types.isObject)(objProp)) {
+          stringified[prop] = {};
+          deepStringifyWithMaxDepth(objProp, stringified[prop], depth + 1, currentPath);
+        } else if ((0, import_types.isArray)(objProp)) {
+          stringified[prop] = [];
+          objProp.forEach((v, i) => {
+            const itemPath = `${currentPath}[${i}]`;
+            if ((0, import_types.isObject)(v)) {
+              stringified[prop][i] = {};
+              deepStringifyWithMaxDepth(v, stringified[prop][i], depth + 1, itemPath);
+            } else if ((0, import_types.isFunction)(v)) {
+              stringified[prop][i] = v.toString();
+            } else {
+              stringified[prop][i] = v;
+            }
+          });
+        } else {
+          stringified[prop] = objProp;
+        }
+      }
+      return stringified;
+    };
     var objectToString = (obj = {}, indent = 0) => {
       const spaces = "  ".repeat(indent);
       let str = "{\n";
@@ -1319,6 +1359,7 @@ var require_cookie = __commonJS({
     __export2(cookie_exports, {
       getCookie: () => getCookie,
       isMobile: () => isMobile,
+      removeCookie: () => removeCookie,
       setCookie: () => setCookie
     });
     module2.exports = __toCommonJS2(cookie_exports);
@@ -1348,6 +1389,11 @@ var require_cookie = __commonJS({
       }
       return "";
     };
+    var removeCookie = (cname) => {
+      if ((0, import_types.isUndefined)(import_utils5.document) || (0, import_types.isUndefined)(import_utils5.document.cookie))
+        return;
+      import_utils5.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+    };
   }
 });
 
@@ -1387,10 +1433,13 @@ var require_tags = __commonJS({
         "title",
         "base",
         "meta",
-        "style"
+        "style",
+        "noscript",
+        "script"
       ],
       body: [
         "string",
+        "style",
         "fragment",
         "a",
         "abbr",
@@ -1543,6 +1592,7 @@ var require_component = __commonJS({
     var component_exports = {};
     __export2(component_exports, {
       addAdditionalExtend: () => addAdditionalExtend,
+      addChildrenIfNotInOriginal: () => addChildrenIfNotInOriginal,
       applyComponentFromContext: () => applyComponentFromContext,
       applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
       checkIfKeyIsComponent: () => checkIfKeyIsComponent,
@@ -1551,7 +1601,8 @@ var require_component = __commonJS({
       getChildrenComponentsByKey: () => getChildrenComponentsByKey,
       getExtendsInElement: () => getExtendsInElement,
       hasVariantProp: () => hasVariantProp,
-      isVariant: () => isVariant
+      isVariant: () => isVariant,
+      setContentKey: () => setContentKey
     });
     module2.exports = __toCommonJS2(component_exports);
     var import__ = require_cjs();
@@ -1577,20 +1628,28 @@ var require_component = __commonJS({
       const extend = (0, import__.joinArrays)(receivedArray, originalArray);
       return { ...element, extend };
     };
+    var checkIfSugar = (element, parent, key) => {
+      const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+      const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
+      return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+    };
     var extendizeByKey = (element, parent, key) => {
       const { context } = parent;
-      const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
-      const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data;
+      const { tag, extend, childrenExtends } = element;
+      const isSugar = checkIfSugar(element);
       const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
       const isExtendKeyComponent = context && context.components[extendFromKey];
       if (element === isExtendKeyComponent)
         return element;
-      else if (!hasComponentAttrs || childProps) {
-        return {
+      else if (isSugar) {
+        const newElem = {
           extend: extendFromKey,
           tag,
           props: { ...element }
         };
+        if (childrenExtends)
+          newElem.childExtend = childrenExtends;
+        return newElem;
       } else if (!extend || extend === true) {
         return {
           ...element,
@@ -1607,6 +1666,37 @@ var require_component = __commonJS({
         };
       }
     };
+    function getCapitalCaseKeys(obj) {
+      return Object.keys(obj).filter((key) => /^[A-Z]/.test(key));
+    }
+    var addChildrenIfNotInOriginal = (element, parent, key) => {
+      const childElems = getCapitalCaseKeys(element.props);
+      if (!childElems.length)
+        return element;
+      for (const i in childElems) {
+        const childKey = childElems[i];
+        const childElem = element[childKey];
+        const newChild = element.props[childKey];
+        if (newChild == null ? void 0 : newChild.ignoreExtend)
+          continue;
+        if (!childElem)
+          element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+        else {
+          const isSugar = checkIfSugar(childElem);
+          if (!isSugar)
+            continue;
+          const inheritedChildElem = element[childKey].props;
+          if ((0, import__.isObjectLike)(newChild)) {
+            (0, import__.overwriteDeep)(inheritedChildElem, newChild);
+          } else if ((0, import__.isFunction)(newChild)) {
+            element[childKey] = {
+              extend: element[childKey],
+              props: newChild
+            };
+          }
+        }
+      }
+    };
     var applyKeyComponentAsExtend = (element, parent, key) => {
       return extendizeByKey(element, parent, key) || element;
     };
@@ -1682,6 +1772,17 @@ var require_component = __commonJS({
       traverse(obj);
       return result;
     };
+    var setContentKey = (el, opts = {}) => {
+      const { __ref: ref } = el;
+      const contentElementKey = opts.contentElementKey;
+      if (contentElementKey !== "content" && contentElementKey !== ref.contentElementKey || !ref.contentElementKey) {
+        ref.contentElementKey = contentElementKey || "content";
+      } else
+        ref.contentElementKey = "content";
+      if (contentElementKey !== "content")
+        opts.contentElementKey = "content";
+      return ref.contentElementKey;
+    };
   }
 });
 
@@ -2307,6 +2408,7 @@ var require_cjs2 = __commonJS({
           deepDiff: () => deepDiff,
           deepMerge: () => deepMerge2,
           deepStringify: () => deepStringify,
+          deepStringifyWithMaxDepth: () => deepStringifyWithMaxDepth,
           detachFunctionsFromObject: () => detachFunctionsFromObject,
           detectInfiniteLoop: () => detectInfiniteLoop,
           diff: () => diff,
@@ -2340,7 +2442,8 @@ var require_cjs2 = __commonJS({
         var ENV = "development";
         var exec = (param, element, state, context) => {
           if ((0, import_types.isFunction)(param)) {
-            return param(
+            return param.call(
+              element,
               element,
               state || element.state,
               context || element.context
@@ -2457,6 +2560,11 @@ var require_cjs2 = __commonJS({
           return o;
         };
         var deepStringify = (obj, stringified = {}) => {
+          var _a;
+          if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
+            console.warn("Trying to clone element or state at", obj);
+            obj = (_a = obj.parse) == null ? void 0 : _a.call(obj);
+          }
           for (const prop in obj) {
             const objProp = obj[prop];
             if ((0, import_types.isFunction)(objProp)) {
@@ -2482,6 +2590,39 @@ var require_cjs2 = __commonJS({
           }
           return stringified;
         };
+        var MAX_DEPTH = 100;
+        var deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
+          if (depth > MAX_DEPTH) {
+            console.warn(`Maximum depth exceeded at path: ${path}. Possible circular reference.`);
+            return "[MAX_DEPTH_EXCEEDED]";
+          }
+          for (const prop in obj) {
+            const currentPath = path ? `${path}.${prop}` : prop;
+            const objProp = obj[prop];
+            if ((0, import_types.isFunction)(objProp)) {
+              stringified[prop] = objProp.toString();
+            } else if ((0, import_types.isObject)(objProp)) {
+              stringified[prop] = {};
+              deepStringifyWithMaxDepth(objProp, stringified[prop], depth + 1, currentPath);
+            } else if ((0, import_types.isArray)(objProp)) {
+              stringified[prop] = [];
+              objProp.forEach((v, i) => {
+                const itemPath = `${currentPath}[${i}]`;
+                if ((0, import_types.isObject)(v)) {
+                  stringified[prop][i] = {};
+                  deepStringifyWithMaxDepth(v, stringified[prop][i], depth + 1, itemPath);
+                } else if ((0, import_types.isFunction)(v)) {
+                  stringified[prop][i] = v.toString();
+                } else {
+                  stringified[prop][i] = v;
+                }
+              });
+            } else {
+              stringified[prop] = objProp;
+            }
+          }
+          return stringified;
+        };
         var objectToString = (obj = {}, indent = 0) => {
           const spaces = "  ".repeat(indent);
           let str = "{\n";
@@ -3023,6 +3164,7 @@ var require_cjs2 = __commonJS({
         __export22(cookie_exports, {
           getCookie: () => getCookie,
           isMobile: () => isMobile,
+          removeCookie: () => removeCookie,
           setCookie: () => setCookie
         });
         module22.exports = __toCommonJS22(cookie_exports);
@@ -3052,6 +3194,11 @@ var require_cjs2 = __commonJS({
           }
           return "";
         };
+        var removeCookie = (cname) => {
+          if ((0, import_types.isUndefined)(import_utils32.document) || (0, import_types.isUndefined)(import_utils32.document.cookie))
+            return;
+          import_utils32.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+        };
       }
     });
     var require_tags2 = __commonJS2({
@@ -3089,10 +3236,13 @@ var require_cjs2 = __commonJS({
             "title",
             "base",
             "meta",
-            "style"
+            "style",
+            "noscript",
+            "script"
           ],
           body: [
             "string",
+            "style",
             "fragment",
             "a",
             "abbr",
@@ -3243,6 +3393,7 @@ var require_cjs2 = __commonJS({
         var component_exports = {};
         __export22(component_exports, {
           addAdditionalExtend: () => addAdditionalExtend,
+          addChildrenIfNotInOriginal: () => addChildrenIfNotInOriginal,
           applyComponentFromContext: () => applyComponentFromContext,
           applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
           checkIfKeyIsComponent: () => checkIfKeyIsComponent,
@@ -3251,7 +3402,8 @@ var require_cjs2 = __commonJS({
           getChildrenComponentsByKey: () => getChildrenComponentsByKey,
           getExtendsInElement: () => getExtendsInElement,
           hasVariantProp: () => hasVariantProp,
-          isVariant: () => isVariant
+          isVariant: () => isVariant,
+          setContentKey: () => setContentKey
         });
         module22.exports = __toCommonJS22(component_exports);
         var import__ = require_cjs3();
@@ -3277,20 +3429,28 @@ var require_cjs2 = __commonJS({
           const extend = (0, import__.joinArrays)(receivedArray, originalArray);
           return { ...element, extend };
         };
+        var checkIfSugar = (element, parent, key) => {
+          const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+          const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
+          return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+        };
         var extendizeByKey = (element, parent, key) => {
           const { context } = parent;
-          const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
-          const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data;
+          const { tag, extend, childrenExtends } = element;
+          const isSugar = checkIfSugar(element);
           const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
           const isExtendKeyComponent = context && context.components[extendFromKey];
           if (element === isExtendKeyComponent)
             return element;
-          else if (!hasComponentAttrs || childProps) {
-            return {
+          else if (isSugar) {
+            const newElem = {
               extend: extendFromKey,
               tag,
               props: { ...element }
             };
+            if (childrenExtends)
+              newElem.childExtend = childrenExtends;
+            return newElem;
           } else if (!extend || extend === true) {
             return {
               ...element,
@@ -3307,6 +3467,37 @@ var require_cjs2 = __commonJS({
             };
           }
         };
+        function getCapitalCaseKeys(obj) {
+          return Object.keys(obj).filter((key) => /^[A-Z]/.test(key));
+        }
+        var addChildrenIfNotInOriginal = (element, parent, key) => {
+          const childElems = getCapitalCaseKeys(element.props);
+          if (!childElems.length)
+            return element;
+          for (const i in childElems) {
+            const childKey = childElems[i];
+            const childElem = element[childKey];
+            const newChild = element.props[childKey];
+            if (newChild == null ? void 0 : newChild.ignoreExtend)
+              continue;
+            if (!childElem)
+              element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+            else {
+              const isSugar = checkIfSugar(childElem);
+              if (!isSugar)
+                continue;
+              const inheritedChildElem = element[childKey].props;
+              if ((0, import__.isObjectLike)(newChild)) {
+                (0, import__.overwriteDeep)(inheritedChildElem, newChild);
+              } else if ((0, import__.isFunction)(newChild)) {
+                element[childKey] = {
+                  extend: element[childKey],
+                  props: newChild
+                };
+              }
+            }
+          }
+        };
         var applyKeyComponentAsExtend = (element, parent, key) => {
           return extendizeByKey(element, parent, key) || element;
         };
@@ -3382,6 +3573,17 @@ var require_cjs2 = __commonJS({
           traverse(obj);
           return result;
         };
+        var setContentKey = (el, opts = {}) => {
+          const { __ref: ref } = el;
+          const contentElementKey = opts.contentElementKey;
+          if (contentElementKey !== "content" && contentElementKey !== ref.contentElementKey || !ref.contentElementKey) {
+            ref.contentElementKey = contentElementKey || "content";
+          } else
+            ref.contentElementKey = "content";
+          if (contentElementKey !== "content")
+            opts.contentElementKey = "content";
+          return ref.contentElementKey;
+        };
       }
     });
     var require_cjs3 = __commonJS2({

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.439",
+  "version": "2.11.446",
   "files": [
     "src",
     "dist"
@@ -25,10 +25,10 @@
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
   "dependencies": {
-    "@domql/globals": "latest",
-    "@domql/utils": "latest",
-    "@symbo.ls/utils": "latest",
+    "@domql/globals": "^2.5.0",
+    "@domql/utils": "^2.5.0",
+    "@symbo.ls/utils": "^2.11.446",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "b16ac3edce7fceb5e81d7cc7bbad51256e10b166"
+  "gitHead": "d042e0c4fc9379b0ca7584f6405cfa2e7c1301d4"
 }

package/src/transforms/index.js

@@ -74,7 +74,7 @@ export const transformBackgroundImage = (backgroundImage, globalTheme) => {
       return {
         backgroundImage: getMediaColor(backgroundImage, globalTheme || CONFIG.globalTheme)
       }
-    } else if (v.includes('/') || v.includes('http')) return `url(${v})`
+    } else if (v.includes('/') || v.startsWith('http') || v.includes('.')) return `url(${v})`
     return v
   }).join(' ')
 }