@symbo.ls/scratch 2.11.453 → 2.11.469

package/dist/cjs/utils/sprite.js

@@ -768,10 +768,10 @@ var require_object = __commonJS({
       return o;
     };
     var deepStringify = (obj, stringified = {}) => {
-      var _a;
+      var _a, _b;
       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);
+        (obj.__element || ((_a = obj.parent) == null ? void 0 : _a.__element)).warn("Trying to clone element or state at", obj);
+        obj = (_b = obj.parse) == null ? void 0 : _b.call(obj);
       }
       for (const prop in obj) {
         const objProp = obj[prop];
@@ -841,7 +841,7 @@ var require_object = __commonJS({
         if ((0, import_types.isArray)(value)) {
           str += "[\n";
           for (const element of value) {
-            if ((0, import_types.isObject)(element) && element !== null) {
+            if ((0, import_types.isObjectLike)(element) && element !== null) {
               str += `${spaces}    ${objectToString(element, indent + 2)},
 `;
             } else if ((0, import_types.isString)(element)) {
@@ -1411,9 +1411,11 @@ var require_cookie = __commonJS({
     var cookie_exports = {};
     __export2(cookie_exports, {
       getCookie: () => getCookie,
+      getLocalStorage: () => getLocalStorage,
       isMobile: () => isMobile,
       removeCookie: () => removeCookie,
-      setCookie: () => setCookie
+      setCookie: () => setCookie,
+      setLocalStorage: () => setLocalStorage
     });
     module2.exports = __toCommonJS2(cookie_exports);
     var import_types = require_types();
@@ -1447,6 +1449,27 @@ var require_cookie = __commonJS({
         return;
       import_utils3.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
     };
+    function getLocalStorage(key) {
+      let savedJSON;
+      if (window.localStorage) {
+        try {
+          savedJSON = JSON.parse(window.localStorage.getItem(key));
+        } catch (e) {
+        }
+      }
+      if (typeof savedJSON !== "undefined") {
+        return savedJSON;
+      }
+    }
+    function setLocalStorage(key, data) {
+      if (data && window.localStorage) {
+        if (typeof data === "object") {
+          window.localStorage.setItem(key, JSON.stringify(data));
+        } else {
+          window.localStorage.setItem(key, data);
+        }
+      }
+    }
   }
 });
 
@@ -1650,7 +1673,9 @@ var require_component = __commonJS({
       applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
       checkIfKeyIsComponent: () => checkIfKeyIsComponent,
       checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+      checkIfSugar: () => checkIfSugar,
       extendizeByKey: () => extendizeByKey,
+      getCapitalCaseKeys: () => getCapitalCaseKeys,
       getChildrenComponentsByKey: () => getChildrenComponentsByKey,
       getExtendsInElement: () => getExtendsInElement,
       hasVariantProp: () => hasVariantProp,
@@ -1684,12 +1709,13 @@ var require_component = __commonJS({
       return { ...element, extend };
     };
     var checkIfSugar = (element, parent, key) => {
+      var _a;
       const {
         extend,
         props,
         childExtend,
         extends: extendProps,
-        childrenExtends,
+        childExtends,
         childProps,
         children,
         on,
@@ -1698,15 +1724,17 @@ var require_component = __commonJS({
         $propsCollection
       } = element;
       const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
-      if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
-        element.error("Sugar component includes params for builtin components");
+      if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+        const logErr = (_a = parent || element) == null ? void 0 : _a.error;
+        if (logErr)
+          logErr.call(element, "Sugar component includes params for builtin components", { verbose: true });
       }
-      return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+      return !hasComponentAttrs || childProps || extendProps || children || childExtends;
     };
     var extendizeByKey = (element, parent, key) => {
       const { context } = parent;
-      const { tag, extend, childrenExtends } = element;
-      const isSugar = checkIfSugar(element);
+      const { tag, extend, childExtends } = element;
+      const isSugar = checkIfSugar(element, parent, key);
       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)
@@ -1717,8 +1745,8 @@ var require_component = __commonJS({
           tag,
           props: { ...element }
         });
-        if (childrenExtends)
-          newElem.childExtend = childrenExtends;
+        if (childExtends)
+          newElem.childExtend = childExtends;
         return newElem;
       } else if (!extend || extend === true) {
         return {
@@ -1747,23 +1775,24 @@ var require_component = __commonJS({
         const childKey = childElems[i];
         const childElem = element[childKey];
         const newChild = element.props[childKey];
+        const assignChild = (val) => {
+          element[childKey] = val;
+          delete element.props[childKey];
+        };
         if (newChild == null ? void 0 : newChild.ignoreExtend)
           continue;
-        if (!childElem)
-          element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+        if (newChild === null)
+          assignChild(null);
+        else if (!childElem)
+          assignChild((0, import__.deepCloneWithExtend)(newChild));
         else {
-          const isSugar = checkIfSugar(childElem);
-          if (!isSugar)
+          const isSugarChildElem = checkIfSugar(childElem, parent, key);
+          if (isSugarChildElem)
             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
-            };
-          }
+          assignChild({
+            extend: element[childKey],
+            props: newChild
+          });
         }
       }
     };
@@ -2109,7 +2138,7 @@ var CONFIG = {
   useVariable: true,
   useReset: true,
   CSS_VARS,
-  ...defaultConfig_exports
+  ...void 0 || defaultConfig_exports
 };
 var cachedConfig = (0, import_utils.deepClone)(CONFIG);
 var FACTORY = {
@@ -2134,10 +2163,11 @@ var generateSprite = (icons) => {
   return sprite;
 };
 var parseRootAttributes = (htmlString) => {
-  if (!(0, import_utils2.isString)(htmlString)) {
-    return console.warn(`parseRootAttributes: ${htmlString} is not a string`);
+  const val = htmlString.default || htmlString;
+  if (!(0, import_utils2.isString)(val)) {
+    return console.warn(`parseRootAttributes: ${val} is not a string`);
   }
-  const match = htmlString.match(/<svg\s+(.*?)>/);
+  const match = val.match(/<svg\s+(.*?)>/);
   if (!match || !match[1]) {
     return {};
   }

package/dist/cjs/utils/var.js

@@ -768,10 +768,10 @@ var require_object = __commonJS({
       return o;
     };
     var deepStringify = (obj, stringified = {}) => {
-      var _a;
+      var _a, _b;
       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);
+        (obj.__element || ((_a = obj.parent) == null ? void 0 : _a.__element)).warn("Trying to clone element or state at", obj);
+        obj = (_b = obj.parse) == null ? void 0 : _b.call(obj);
       }
       for (const prop in obj) {
         const objProp = obj[prop];
@@ -841,7 +841,7 @@ var require_object = __commonJS({
         if ((0, import_types.isArray)(value)) {
           str += "[\n";
           for (const element of value) {
-            if ((0, import_types.isObject)(element) && element !== null) {
+            if ((0, import_types.isObjectLike)(element) && element !== null) {
               str += `${spaces}    ${objectToString(element, indent + 2)},
 `;
             } else if ((0, import_types.isString)(element)) {
@@ -1411,9 +1411,11 @@ var require_cookie = __commonJS({
     var cookie_exports = {};
     __export2(cookie_exports, {
       getCookie: () => getCookie,
+      getLocalStorage: () => getLocalStorage,
       isMobile: () => isMobile,
       removeCookie: () => removeCookie,
-      setCookie: () => setCookie
+      setCookie: () => setCookie,
+      setLocalStorage: () => setLocalStorage
     });
     module2.exports = __toCommonJS2(cookie_exports);
     var import_types = require_types();
@@ -1447,6 +1449,27 @@ var require_cookie = __commonJS({
         return;
       import_utils5.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
     };
+    function getLocalStorage(key) {
+      let savedJSON;
+      if (window.localStorage) {
+        try {
+          savedJSON = JSON.parse(window.localStorage.getItem(key));
+        } catch (e) {
+        }
+      }
+      if (typeof savedJSON !== "undefined") {
+        return savedJSON;
+      }
+    }
+    function setLocalStorage(key, data) {
+      if (data && window.localStorage) {
+        if (typeof data === "object") {
+          window.localStorage.setItem(key, JSON.stringify(data));
+        } else {
+          window.localStorage.setItem(key, data);
+        }
+      }
+    }
   }
 });
 
@@ -1650,7 +1673,9 @@ var require_component = __commonJS({
       applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
       checkIfKeyIsComponent: () => checkIfKeyIsComponent,
       checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+      checkIfSugar: () => checkIfSugar,
       extendizeByKey: () => extendizeByKey,
+      getCapitalCaseKeys: () => getCapitalCaseKeys,
       getChildrenComponentsByKey: () => getChildrenComponentsByKey,
       getExtendsInElement: () => getExtendsInElement,
       hasVariantProp: () => hasVariantProp,
@@ -1684,12 +1709,13 @@ var require_component = __commonJS({
       return { ...element, extend };
     };
     var checkIfSugar = (element, parent, key) => {
+      var _a;
       const {
         extend,
         props,
         childExtend,
         extends: extendProps,
-        childrenExtends,
+        childExtends,
         childProps,
         children,
         on,
@@ -1698,15 +1724,17 @@ var require_component = __commonJS({
         $propsCollection
       } = element;
       const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
-      if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
-        element.error("Sugar component includes params for builtin components");
+      if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+        const logErr = (_a = parent || element) == null ? void 0 : _a.error;
+        if (logErr)
+          logErr.call(element, "Sugar component includes params for builtin components", { verbose: true });
       }
-      return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+      return !hasComponentAttrs || childProps || extendProps || children || childExtends;
     };
     var extendizeByKey = (element, parent, key) => {
       const { context } = parent;
-      const { tag, extend, childrenExtends } = element;
-      const isSugar = checkIfSugar(element);
+      const { tag, extend, childExtends } = element;
+      const isSugar = checkIfSugar(element, parent, key);
       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)
@@ -1717,8 +1745,8 @@ var require_component = __commonJS({
           tag,
           props: { ...element }
         });
-        if (childrenExtends)
-          newElem.childExtend = childrenExtends;
+        if (childExtends)
+          newElem.childExtend = childExtends;
         return newElem;
       } else if (!extend || extend === true) {
         return {
@@ -1747,23 +1775,24 @@ var require_component = __commonJS({
         const childKey = childElems[i];
         const childElem = element[childKey];
         const newChild = element.props[childKey];
+        const assignChild = (val) => {
+          element[childKey] = val;
+          delete element.props[childKey];
+        };
         if (newChild == null ? void 0 : newChild.ignoreExtend)
           continue;
-        if (!childElem)
-          element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+        if (newChild === null)
+          assignChild(null);
+        else if (!childElem)
+          assignChild((0, import__.deepCloneWithExtend)(newChild));
         else {
-          const isSugar = checkIfSugar(childElem);
-          if (!isSugar)
+          const isSugarChildElem = checkIfSugar(childElem, parent, key);
+          if (isSugarChildElem)
             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
-            };
-          }
+          assignChild({
+            extend: element[childKey],
+            props: newChild
+          });
         }
       }
     };
@@ -2649,10 +2678,10 @@ var require_cjs2 = __commonJS({
           return o;
         };
         var deepStringify = (obj, stringified = {}) => {
-          var _a;
+          var _a, _b;
           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);
+            (obj.__element || ((_a = obj.parent) == null ? void 0 : _a.__element)).warn("Trying to clone element or state at", obj);
+            obj = (_b = obj.parse) == null ? void 0 : _b.call(obj);
           }
           for (const prop in obj) {
             const objProp = obj[prop];
@@ -2722,7 +2751,7 @@ var require_cjs2 = __commonJS({
             if ((0, import_types.isArray)(value)) {
               str += "[\n";
               for (const element of value) {
-                if ((0, import_types.isObject)(element) && element !== null) {
+                if ((0, import_types.isObjectLike)(element) && element !== null) {
                   str += `${spaces}    ${objectToString(element, indent + 2)},
 `;
                 } else if ((0, import_types.isString)(element)) {
@@ -3286,9 +3315,11 @@ var require_cjs2 = __commonJS({
         var cookie_exports = {};
         __export22(cookie_exports, {
           getCookie: () => getCookie,
+          getLocalStorage: () => getLocalStorage,
           isMobile: () => isMobile,
           removeCookie: () => removeCookie,
-          setCookie: () => setCookie
+          setCookie: () => setCookie,
+          setLocalStorage: () => setLocalStorage
         });
         module22.exports = __toCommonJS22(cookie_exports);
         var import_types = require_types2();
@@ -3322,6 +3353,27 @@ var require_cjs2 = __commonJS({
             return;
           import_utils32.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
         };
+        function getLocalStorage(key) {
+          let savedJSON;
+          if (window.localStorage) {
+            try {
+              savedJSON = JSON.parse(window.localStorage.getItem(key));
+            } catch (e) {
+            }
+          }
+          if (typeof savedJSON !== "undefined") {
+            return savedJSON;
+          }
+        }
+        function setLocalStorage(key, data) {
+          if (data && window.localStorage) {
+            if (typeof data === "object") {
+              window.localStorage.setItem(key, JSON.stringify(data));
+            } else {
+              window.localStorage.setItem(key, data);
+            }
+          }
+        }
       }
     });
     var require_tags2 = __commonJS2({
@@ -3521,7 +3573,9 @@ var require_cjs2 = __commonJS({
           applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
           checkIfKeyIsComponent: () => checkIfKeyIsComponent,
           checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+          checkIfSugar: () => checkIfSugar,
           extendizeByKey: () => extendizeByKey,
+          getCapitalCaseKeys: () => getCapitalCaseKeys,
           getChildrenComponentsByKey: () => getChildrenComponentsByKey,
           getExtendsInElement: () => getExtendsInElement,
           hasVariantProp: () => hasVariantProp,
@@ -3555,12 +3609,13 @@ var require_cjs2 = __commonJS({
           return { ...element, extend };
         };
         var checkIfSugar = (element, parent, key) => {
+          var _a;
           const {
             extend,
             props,
             childExtend,
             extends: extendProps,
-            childrenExtends,
+            childExtends,
             childProps,
             children,
             on,
@@ -3569,15 +3624,17 @@ var require_cjs2 = __commonJS({
             $propsCollection
           } = element;
           const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
-          if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
-            element.error("Sugar component includes params for builtin components");
+          if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+            const logErr = (_a = parent || element) == null ? void 0 : _a.error;
+            if (logErr)
+              logErr.call(element, "Sugar component includes params for builtin components", { verbose: true });
           }
-          return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+          return !hasComponentAttrs || childProps || extendProps || children || childExtends;
         };
         var extendizeByKey = (element, parent, key) => {
           const { context } = parent;
-          const { tag, extend, childrenExtends } = element;
-          const isSugar = checkIfSugar(element);
+          const { tag, extend, childExtends } = element;
+          const isSugar = checkIfSugar(element, parent, key);
           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)
@@ -3588,8 +3645,8 @@ var require_cjs2 = __commonJS({
               tag,
               props: { ...element }
             });
-            if (childrenExtends)
-              newElem.childExtend = childrenExtends;
+            if (childExtends)
+              newElem.childExtend = childExtends;
             return newElem;
           } else if (!extend || extend === true) {
             return {
@@ -3618,23 +3675,24 @@ var require_cjs2 = __commonJS({
             const childKey = childElems[i];
             const childElem = element[childKey];
             const newChild = element.props[childKey];
+            const assignChild = (val) => {
+              element[childKey] = val;
+              delete element.props[childKey];
+            };
             if (newChild == null ? void 0 : newChild.ignoreExtend)
               continue;
-            if (!childElem)
-              element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+            if (newChild === null)
+              assignChild(null);
+            else if (!childElem)
+              assignChild((0, import__.deepCloneWithExtend)(newChild));
             else {
-              const isSugar = checkIfSugar(childElem);
-              if (!isSugar)
+              const isSugarChildElem = checkIfSugar(childElem, parent, key);
+              if (isSugarChildElem)
                 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
-                };
-              }
+              assignChild({
+                extend: element[childKey],
+                props: newChild
+              });
             }
           }
         };
@@ -4190,7 +4248,7 @@ var CONFIG = {
   useVariable: true,
   useReset: true,
   CSS_VARS,
-  ...defaultConfig_exports
+  ...void 0 || defaultConfig_exports
 };
 var cachedConfig = (0, import_utils.deepClone)(CONFIG);
 var FACTORY = {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.453",
+  "version": "2.11.469",
   "files": [
     "src",
     "dist"
@@ -27,8 +27,8 @@
   "dependencies": {
     "@domql/globals": "latest",
     "@domql/utils": "^2.5.0",
-    "@symbo.ls/utils": "^2.11.453",
+    "@symbo.ls/utils": "^2.11.469",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "8e5458a957b9d2c75944023e2c31bab157034314"
+  "gitHead": "711b668d5e97cf07bdc3ecec069a89c4eddee826"
 }

package/src/factory.js

@@ -14,7 +14,7 @@ export const CONFIG = {
   useVariable: true,
   useReset: true,
   CSS_VARS,
-  ...CONF
+  ...(CONF.default || CONF)
 }
 
 const cachedConfig = deepClone(CONFIG)

package/src/utils/sprite.js

@@ -18,11 +18,12 @@ export const generateSprite = (icons) => {
 }
 
 const parseRootAttributes = (htmlString) => {
-  if (!isString(htmlString)) {
-    return console.warn(`parseRootAttributes: ${htmlString} is not a string`)
+  const val = htmlString.default || htmlString
+  if (!isString(val)) {
+    return console.warn(`parseRootAttributes: ${val} is not a string`)
   }
 
-  const match = htmlString.match(/<svg\s+(.*?)>/)
+  const match = val.match(/<svg\s+(.*?)>/)
   if (!match || !match[1]) {
     return {}
   }