@symbo.ls/scratch 2.11.315 → 2.11.337

package/dist/cjs/utils/index.js

@@ -382,6 +382,8 @@ var require_array = __commonJS({
       return arr;
     };
     var cutArrayAfterValue = (arr, value) => {
+      if (!(0, import_types.isArray)(arr))
+        return;
       const index = arr.indexOf(value);
       if (index !== -1) {
         return arr.slice(index + 1);
@@ -460,13 +462,16 @@ var require_string = __commonJS({
       const pattern = new RegExp(`[${characters.join("\\")}]`, "g");
       return str.replace(pattern, "");
     };
-    var brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g;
-    var replaceLiteralsWithObjectFields = (str, state) => {
-      if (!str.includes("{{"))
+    var brackRegex = {
+      2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
+      3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+    };
+    var replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
+      if (!str.includes(opts.bracketsLength === 3 ? "{{{" : "{{"))
         return str;
-      return str.replace(brackRegex, (_, parentPath, variable) => {
+      return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
         if (parentPath) {
-          const parentLevels = parentPath.match(/\.\.\//g).length;
+          const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
           let parentState = state;
           for (let i = 0; i < parentLevels; i++) {
             parentState = parentState.parent;
@@ -513,8 +518,9 @@ var require_object = __commonJS({
     __export2(object_exports, {
       clone: () => clone,
       deepClone: () => deepClone2,
+      deepCloneEntrance: () => deepCloneEntrance,
       deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtnd: () => deepCloneWithExtnd,
+      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -645,18 +651,24 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneWithExtnd = (obj, excludeFrom = [], cleanUndefined = false) => {
+    var deepCloneEntrance = (...params) => {
+      let extended;
+      try {
+        extended = deepCloneWithExtend(...params);
+      } catch {
+        console.log("HERE", extended);
+      }
+      return extended;
+    };
+    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
       const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
-        if (prop === "__proto__")
-          continue;
-        if (excludeFrom.includes(prop) || prop.startsWith("__"))
-          continue;
+        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
         const objProp = obj[prop];
-        if (cleanUndefined && (0, import_types.isUndefined)(objProp))
+        if (!hasOwnProperty2 || excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
           continue;
         if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtnd(objProp, excludeFrom, cleanUndefined);
+          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
         } else
           o[prop] = objProp;
       }
@@ -1433,7 +1445,7 @@ var import_utils = __toESM(require_cjs2(), 1);
 var ENV = "development";
 var colorStringToRgbaArray = (color) => {
   if (color === "")
-    return;
+    return [0, 0, 0, 0];
   if (color.toLowerCase() === "transparent")
     return [0, 0, 0, 0];
   if (color[0] === "#") {
@@ -1456,7 +1468,7 @@ var colorStringToRgbaArray = (color) => {
         return;
       elem.style.color = color;
       if (elem.style.color === flag || elem.style.color === "")
-        return;
+        return [0, 0, 0, 0];
       color = import_globals.window.getComputedStyle(elem).color;
       import_globals.document.body.removeChild(elem);
     }
@@ -1466,7 +1478,7 @@ var colorStringToRgbaArray = (color) => {
       color = `${color}, 1`;
     return color.match(/[\.\d]+/g).map((a) => +a);
   }
-  return [];
+  return [0, 0, 0, 0];
 };
 var mixTwoColors = (colorA, colorB, range = 0.5) => {
   colorA = colorStringToRgbaArray(colorA);
@@ -1658,6 +1670,7 @@ __export(defaultConfig_exports, {
   FONT_FAMILY: () => FONT_FAMILY,
   FONT_FAMILY_TYPES: () => FONT_FAMILY_TYPES,
   GRADIENT: () => GRADIENT,
+  GRID: () => GRID,
   ICONS: () => ICONS,
   MEDIA: () => MEDIA,
   RESET: () => RESET,
@@ -1830,6 +1843,10 @@ var SVG_DATA = {};
 // src/defaultConfig/templates.js
 var TEMPLATES = {};
 
+// src/defaultConfig/grid.js
+var defaultProps4 = {};
+var GRID = defaultProps4;
+
 // src/defaultConfig/index.js
 var RESET = {};
 

package/dist/cjs/utils/sequence.js

@@ -346,6 +346,8 @@ var require_array = __commonJS({
       return arr;
     };
     var cutArrayAfterValue = (arr, value) => {
+      if (!(0, import_types.isArray)(arr))
+        return;
       const index = arr.indexOf(value);
       if (index !== -1) {
         return arr.slice(index + 1);
@@ -424,13 +426,16 @@ var require_string = __commonJS({
       const pattern = new RegExp(`[${characters.join("\\")}]`, "g");
       return str.replace(pattern, "");
     };
-    var brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g;
-    var replaceLiteralsWithObjectFields = (str, state) => {
-      if (!str.includes("{{"))
+    var brackRegex = {
+      2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
+      3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+    };
+    var replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
+      if (!str.includes(opts.bracketsLength === 3 ? "{{{" : "{{"))
         return str;
-      return str.replace(brackRegex, (_, parentPath, variable) => {
+      return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
         if (parentPath) {
-          const parentLevels = parentPath.match(/\.\.\//g).length;
+          const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
           let parentState = state;
           for (let i = 0; i < parentLevels; i++) {
             parentState = parentState.parent;
@@ -477,8 +482,9 @@ var require_object = __commonJS({
     __export2(object_exports, {
       clone: () => clone,
       deepClone: () => deepClone2,
+      deepCloneEntrance: () => deepCloneEntrance,
       deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtnd: () => deepCloneWithExtnd,
+      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -609,18 +615,24 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneWithExtnd = (obj, excludeFrom = [], cleanUndefined = false) => {
+    var deepCloneEntrance = (...params) => {
+      let extended;
+      try {
+        extended = deepCloneWithExtend(...params);
+      } catch {
+        console.log("HERE", extended);
+      }
+      return extended;
+    };
+    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
       const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
-        if (prop === "__proto__")
-          continue;
-        if (excludeFrom.includes(prop) || prop.startsWith("__"))
-          continue;
+        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
         const objProp = obj[prop];
-        if (cleanUndefined && (0, import_types.isUndefined)(objProp))
+        if (!hasOwnProperty2 || excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
           continue;
         if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtnd(objProp, excludeFrom, cleanUndefined);
+          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
         } else
           o[prop] = objProp;
       }
@@ -1381,6 +1393,7 @@ __export(defaultConfig_exports, {
   FONT_FAMILY: () => FONT_FAMILY,
   FONT_FAMILY_TYPES: () => FONT_FAMILY_TYPES,
   GRADIENT: () => GRADIENT,
+  GRID: () => GRID,
   ICONS: () => ICONS,
   MEDIA: () => MEDIA,
   RESET: () => RESET,
@@ -1553,6 +1566,10 @@ var SVG_DATA = {};
 // src/defaultConfig/templates.js
 var TEMPLATES = {};
 
+// src/defaultConfig/grid.js
+var defaultProps4 = {};
+var GRID = defaultProps4;
+
 // src/defaultConfig/index.js
 var RESET = {};
 

package/dist/cjs/utils/sprite.js

@@ -346,6 +346,8 @@ var require_array = __commonJS({
       return arr;
     };
     var cutArrayAfterValue = (arr, value) => {
+      if (!(0, import_types.isArray)(arr))
+        return;
       const index = arr.indexOf(value);
       if (index !== -1) {
         return arr.slice(index + 1);
@@ -424,13 +426,16 @@ var require_string = __commonJS({
       const pattern = new RegExp(`[${characters.join("\\")}]`, "g");
       return str.replace(pattern, "");
     };
-    var brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g;
-    var replaceLiteralsWithObjectFields = (str, state) => {
-      if (!str.includes("{{"))
+    var brackRegex = {
+      2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
+      3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+    };
+    var replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
+      if (!str.includes(opts.bracketsLength === 3 ? "{{{" : "{{"))
         return str;
-      return str.replace(brackRegex, (_, parentPath, variable) => {
+      return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
         if (parentPath) {
-          const parentLevels = parentPath.match(/\.\.\//g).length;
+          const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
           let parentState = state;
           for (let i = 0; i < parentLevels; i++) {
             parentState = parentState.parent;
@@ -477,8 +482,9 @@ var require_object = __commonJS({
     __export2(object_exports, {
       clone: () => clone,
       deepClone: () => deepClone2,
+      deepCloneEntrance: () => deepCloneEntrance,
       deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtnd: () => deepCloneWithExtnd,
+      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -609,18 +615,24 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneWithExtnd = (obj, excludeFrom = [], cleanUndefined = false) => {
+    var deepCloneEntrance = (...params) => {
+      let extended;
+      try {
+        extended = deepCloneWithExtend(...params);
+      } catch {
+        console.log("HERE", extended);
+      }
+      return extended;
+    };
+    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
       const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
-        if (prop === "__proto__")
-          continue;
-        if (excludeFrom.includes(prop) || prop.startsWith("__"))
-          continue;
+        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
         const objProp = obj[prop];
-        if (cleanUndefined && (0, import_types.isUndefined)(objProp))
+        if (!hasOwnProperty2 || excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
           continue;
         if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtnd(objProp, excludeFrom, cleanUndefined);
+          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
         } else
           o[prop] = objProp;
       }
@@ -1363,6 +1375,7 @@ __export(defaultConfig_exports, {
   FONT_FAMILY: () => FONT_FAMILY,
   FONT_FAMILY_TYPES: () => FONT_FAMILY_TYPES,
   GRADIENT: () => GRADIENT,
+  GRID: () => GRID,
   ICONS: () => ICONS,
   MEDIA: () => MEDIA,
   RESET: () => RESET,
@@ -1535,6 +1548,10 @@ var SVG_DATA = {};
 // src/defaultConfig/templates.js
 var TEMPLATES = {};
 
+// src/defaultConfig/grid.js
+var defaultProps4 = {};
+var GRID = defaultProps4;
+
 // src/defaultConfig/index.js
 var RESET = {};
 

package/dist/cjs/utils/var.js

@@ -346,6 +346,8 @@ var require_array = __commonJS({
       return arr;
     };
     var cutArrayAfterValue = (arr, value) => {
+      if (!(0, import_types.isArray)(arr))
+        return;
       const index = arr.indexOf(value);
       if (index !== -1) {
         return arr.slice(index + 1);
@@ -424,13 +426,16 @@ var require_string = __commonJS({
       const pattern = new RegExp(`[${characters.join("\\")}]`, "g");
       return str.replace(pattern, "");
     };
-    var brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g;
-    var replaceLiteralsWithObjectFields = (str, state) => {
-      if (!str.includes("{{"))
+    var brackRegex = {
+      2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
+      3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+    };
+    var replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
+      if (!str.includes(opts.bracketsLength === 3 ? "{{{" : "{{"))
         return str;
-      return str.replace(brackRegex, (_, parentPath, variable) => {
+      return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
         if (parentPath) {
-          const parentLevels = parentPath.match(/\.\.\//g).length;
+          const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
           let parentState = state;
           for (let i = 0; i < parentLevels; i++) {
             parentState = parentState.parent;
@@ -477,8 +482,9 @@ var require_object = __commonJS({
     __export2(object_exports, {
       clone: () => clone,
       deepClone: () => deepClone2,
+      deepCloneEntrance: () => deepCloneEntrance,
       deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtnd: () => deepCloneWithExtnd,
+      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -609,18 +615,24 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneWithExtnd = (obj, excludeFrom = [], cleanUndefined = false) => {
+    var deepCloneEntrance = (...params) => {
+      let extended;
+      try {
+        extended = deepCloneWithExtend(...params);
+      } catch {
+        console.log("HERE", extended);
+      }
+      return extended;
+    };
+    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
       const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
-        if (prop === "__proto__")
-          continue;
-        if (excludeFrom.includes(prop) || prop.startsWith("__"))
-          continue;
+        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
         const objProp = obj[prop];
-        if (cleanUndefined && (0, import_types.isUndefined)(objProp))
+        if (!hasOwnProperty2 || excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
           continue;
         if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtnd(objProp, excludeFrom, cleanUndefined);
+          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
         } else
           o[prop] = objProp;
       }
@@ -1365,6 +1377,7 @@ __export(defaultConfig_exports, {
   FONT_FAMILY: () => FONT_FAMILY,
   FONT_FAMILY_TYPES: () => FONT_FAMILY_TYPES,
   GRADIENT: () => GRADIENT,
+  GRID: () => GRID,
   ICONS: () => ICONS,
   MEDIA: () => MEDIA,
   RESET: () => RESET,
@@ -1537,6 +1550,10 @@ var SVG_DATA = {};
 // src/defaultConfig/templates.js
 var TEMPLATES = {};
 
+// src/defaultConfig/grid.js
+var defaultProps4 = {};
+var GRID = defaultProps4;
+
 // src/defaultConfig/index.js
 var RESET = {};
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.315",
+  "version": "2.11.337",
   "files": [
     "src",
     "dist"
@@ -29,5 +29,5 @@
     "@symbo.ls/utils": "latest",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "f7e5836ff0fad163a721cd8a823e2da1a7f346ef"
+  "gitHead": "5a5391d39de3ebc122998f2f096bbbf3dcbe72b8"
 }

package/src/defaultConfig/class.js

@@ -0,0 +1,5 @@
+'use strict'
+
+const defaultProps = {}
+
+export const CLASS = defaultProps

package/src/defaultConfig/grid.js

@@ -0,0 +1,5 @@
+'use strict'
+
+const defaultProps = {}
+
+export const GRID = defaultProps

package/src/defaultConfig/index.js

@@ -18,5 +18,6 @@ export * from './cases.js'
 export * from './animation.js'
 export * from './svg.js'
 export * from './templates.js'
+export * from './grid.js'
 
 export const RESET = {}

package/src/set.js

@@ -40,6 +40,8 @@ export const VALUE_TRANSFORMERS = {
   shadow: setShadow,
   spacing: setSameValue,
   media: setSameValue,
+  grid: setSameValue,
+  class: setSameValue,
   timing: setSameValue,
   reset: setSameValue,
   unit: setSameValue,

package/src/system/color.js

@@ -87,7 +87,17 @@ export const getMediaColor = (value, globalTheme, config) => {
 export const setColor = (val, key, suffix) => {
   const CONFIG = getActiveConfig()
 
-  if (isString(val) && val.slice(0, 2) === '--') val = getColor(val.slice(2))
+  if (isString(val) && val.slice(0, 2) === '--') {
+    val = getColor(val.slice(2))
+    if (!(
+      val.includes('rgb') ||
+      val.includes('var') ||
+      val.includes('#')
+    )) {
+      if (CONFIG.verbose) console.warn(val, '- referred but does not exist')
+      val = val.split(' ')[0]
+    }
+  }
 
   if (isArray(val)) {
     return {
@@ -109,7 +119,8 @@ export const setColor = (val, key, suffix) => {
   }
 
   const CSSVar = `--color-${key}` + (suffix ? `-${suffix}` : '')
-  const [r, g, b, a = 1] = colorStringToRgbaArray(val.value || val)
+  const colorArr = colorStringToRgbaArray(val.value || val)
+  const [r, g, b, a = 1] = colorArr
   const alpha = parseFloat(a.toFixed(2))
   const rgb = `${r}, ${g}, ${b}`
   const value = `rgba(${rgb}, ${alpha})`

package/src/utils/color.js

@@ -5,7 +5,7 @@ import { isString, isNumber } from '@domql/utils'
 const ENV = process.env.NODE_ENV
 
 export const colorStringToRgbaArray = color => {
-  if (color === '') return
+  if (color === '') return [0, 0, 0, 0]
   if (color.toLowerCase() === 'transparent') return [0, 0, 0, 0]
 
   // convert #RGB and #RGBA to #RRGGBB and #RRGGBBAA
@@ -29,7 +29,7 @@ export const colorStringToRgbaArray = color => {
       // color set failed - some monstrous css rule is probably taking over the color of our object
       if (elem.style.color !== flag) return
       elem.style.color = color
-      if (elem.style.color === flag || elem.style.color === '') return // color parse failed
+      if (elem.style.color === flag || elem.style.color === '') return [0, 0, 0, 0] // color parse failed
       color = window.getComputedStyle(elem).color
       document.body.removeChild(elem)
     }
@@ -41,8 +41,7 @@ export const colorStringToRgbaArray = color => {
     return color.match(/[\.\d]+/g).map(a => +a) // eslint-disable-line
   }
 
-  // TODO: fix this
-  return []
+  return [0, 0, 0, 0]
 }
 
 export const mixTwoColors = (colorA, colorB, range = 0.5) => {