@symbo.ls/scratch 2.11.261 → 2.11.265

package/dist/cjs/index.js

@@ -247,12 +247,12 @@ var require_types = __commonJS({
       isDefined: () => isDefined2,
       isFunction: () => isFunction2,
       isNot: () => isNot,
-      isNull: () => isNull,
+      isNull: () => isNull2,
       isNumber: () => isNumber3,
       isObject: () => isObject8,
       isObjectLike: () => isObjectLike3,
       isString: () => isString10,
-      isUndefined: () => isUndefined
+      isUndefined: () => isUndefined2
     });
     module2.exports = __toCommonJS2(types_exports);
     var import_node = require_node();
@@ -265,7 +265,7 @@ var require_types = __commonJS({
     var isNumber3 = (arg) => typeof arg === "number";
     var isFunction2 = (arg) => typeof arg === "function";
     var isBoolean = (arg) => arg === true || arg === false;
-    var isNull = (arg) => arg === null;
+    var isNull2 = (arg) => arg === null;
     var isArray9 = (arg) => Array.isArray(arg);
     var isDate = (d) => d instanceof Date;
     var isObjectLike3 = (arg) => {
@@ -274,9 +274,9 @@ var require_types = __commonJS({
       return typeof arg === "object";
     };
     var isDefined2 = (arg) => {
-      return isObject8(arg) || isObjectLike3(arg) || isString10(arg) || isNumber3(arg) || isFunction2(arg) || isArray9(arg) || isObjectLike3(arg) || isBoolean(arg) || isDate(arg) || isNull(arg);
+      return isObject8(arg) || isObjectLike3(arg) || isString10(arg) || isNumber3(arg) || isFunction2(arg) || isArray9(arg) || isObjectLike3(arg) || isBoolean(arg) || isDate(arg) || isNull2(arg);
     };
-    var isUndefined = (arg) => {
+    var isUndefined2 = (arg) => {
       return arg === void 0;
     };
     var TYPES = {
@@ -286,7 +286,7 @@ var require_types = __commonJS({
       string: isString10,
       date: isDate,
       number: isNumber3,
-      null: isNull,
+      null: isNull2,
       function: isFunction2,
       objectLike: isObjectLike3,
       node: import_node.isNode,
@@ -2188,7 +2188,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};
@@ -2711,22 +2711,24 @@ var findModifier = (val, modifier) => {
   else
     return val;
 };
-var getMediaTheme = (val, mod) => {
-  const CONFIG2 = getActiveConfig();
-  if ((0, import_utils11.isString)(val) && val.slice(0, 2) === "--")
-    val = getMediaTheme(val.slice(2));
-  if (!val || !(0, import_utils11.isString)(val)) {
-    if (CONFIG2.verbose)
-      console.warn(val, "- theme is not string");
+var getMediaTheme = (value, modifier) => {
+  const activeConfig = getActiveConfig();
+  if ((0, import_utils11.isString)(value) && value.slice(0, 2) === "--") {
+    value = getMediaTheme(value.slice(2));
+  }
+  if (!value || !(0, import_utils11.isString)(value)) {
+    if (activeConfig.verbose) {
+      console.warn(`${value} - Theme is not a string`);
+    }
     return;
   }
-  const [name, ...modifier] = (0, import_utils11.isArray)(val) ? val : val.split(" ");
-  let value = CONFIG2.THEME[name];
-  if (value && (modifier || mod)) {
-    value = findModifier(value, modifier.length ? modifier : mod);
+  const [themeName, ...themeModifiers] = (0, import_utils11.isArray)(value) ? value : value.split(" ");
+  let themeValue = activeConfig.THEME[themeName];
+  if (themeValue && (themeModifiers || modifier)) {
+    themeValue = findModifier(themeValue, themeModifiers.length ? themeModifiers : modifier);
   }
-  const r = recursiveTheme(value);
-  return r;
+  const resolvedTheme = recursiveTheme(themeValue);
+  return resolvedTheme;
 };
 
 // src/system/font.js
@@ -3318,8 +3320,8 @@ var checkIfBoxSize = (propertyName) => {
   return (prop.includes("width") || prop.includes("height")) && !prop.includes("border");
 };
 var transformSize = (propertyName, val, props = {}, opts = {}) => {
-  let value = val !== void 0 ? val : props[propertyName];
-  if (value === void 0)
+  let value = val || props[propertyName];
+  if ((0, import_utils27.isUndefined)(value) && (0, import_utils27.isNull)(value))
     return;
   const shouldScaleBoxSize = props.scaleBoxSize;
   const isBoxSize = checkIfBoxSize(propertyName);

package/dist/cjs/set.js

@@ -1938,7 +1938,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};
@@ -2371,22 +2371,24 @@ var findModifier = (val, modifier) => {
   else
     return val;
 };
-var getMediaTheme = (val, mod) => {
-  const CONFIG2 = getActiveConfig();
-  if ((0, import_utils11.isString)(val) && val.slice(0, 2) === "--")
-    val = getMediaTheme(val.slice(2));
-  if (!val || !(0, import_utils11.isString)(val)) {
-    if (CONFIG2.verbose)
-      console.warn(val, "- theme is not string");
+var getMediaTheme = (value, modifier) => {
+  const activeConfig = getActiveConfig();
+  if ((0, import_utils11.isString)(value) && value.slice(0, 2) === "--") {
+    value = getMediaTheme(value.slice(2));
+  }
+  if (!value || !(0, import_utils11.isString)(value)) {
+    if (activeConfig.verbose) {
+      console.warn(`${value} - Theme is not a string`);
+    }
     return;
   }
-  const [name, ...modifier] = (0, import_utils11.isArray)(val) ? val : val.split(" ");
-  let value = CONFIG2.THEME[name];
-  if (value && (modifier || mod)) {
-    value = findModifier(value, modifier.length ? modifier : mod);
+  const [themeName, ...themeModifiers] = (0, import_utils11.isArray)(value) ? value : value.split(" ");
+  let themeValue = activeConfig.THEME[themeName];
+  if (themeValue && (themeModifiers || modifier)) {
+    themeValue = findModifier(themeValue, themeModifiers.length ? themeModifiers : modifier);
   }
-  const r = recursiveTheme(value);
-  return r;
+  const resolvedTheme = recursiveTheme(themeValue);
+  return resolvedTheme;
 };
 
 // src/system/font.js

package/dist/cjs/system/index.js

@@ -1961,7 +1961,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};
@@ -2441,22 +2441,24 @@ var findModifier = (val, modifier) => {
   else
     return val;
 };
-var getMediaTheme = (val, mod) => {
-  const CONFIG2 = getActiveConfig();
-  if ((0, import_utils11.isString)(val) && val.slice(0, 2) === "--")
-    val = getMediaTheme(val.slice(2));
-  if (!val || !(0, import_utils11.isString)(val)) {
-    if (CONFIG2.verbose)
-      console.warn(val, "- theme is not string");
+var getMediaTheme = (value, modifier) => {
+  const activeConfig = getActiveConfig();
+  if ((0, import_utils11.isString)(value) && value.slice(0, 2) === "--") {
+    value = getMediaTheme(value.slice(2));
+  }
+  if (!value || !(0, import_utils11.isString)(value)) {
+    if (activeConfig.verbose) {
+      console.warn(`${value} - Theme is not a string`);
+    }
     return;
   }
-  const [name, ...modifier] = (0, import_utils11.isArray)(val) ? val : val.split(" ");
-  let value = CONFIG2.THEME[name];
-  if (value && (modifier || mod)) {
-    value = findModifier(value, modifier.length ? modifier : mod);
+  const [themeName, ...themeModifiers] = (0, import_utils11.isArray)(value) ? value : value.split(" ");
+  let themeValue = activeConfig.THEME[themeName];
+  if (themeValue && (themeModifiers || modifier)) {
+    themeValue = findModifier(themeValue, themeModifiers.length ? themeModifiers : modifier);
   }
-  const r = recursiveTheme(value);
-  return r;
+  const resolvedTheme = recursiveTheme(themeValue);
+  return resolvedTheme;
 };
 
 // src/system/font.js

package/dist/cjs/system/reset.js

@@ -1640,22 +1640,24 @@ var findModifier = (val, modifier) => {
   else
     return val;
 };
-var getMediaTheme = (val, mod) => {
-  const CONFIG2 = getActiveConfig();
-  if ((0, import_utils11.isString)(val) && val.slice(0, 2) === "--")
-    val = getMediaTheme(val.slice(2));
-  if (!val || !(0, import_utils11.isString)(val)) {
-    if (CONFIG2.verbose)
-      console.warn(val, "- theme is not string");
+var getMediaTheme = (value, modifier) => {
+  const activeConfig = getActiveConfig();
+  if ((0, import_utils11.isString)(value) && value.slice(0, 2) === "--") {
+    value = getMediaTheme(value.slice(2));
+  }
+  if (!value || !(0, import_utils11.isString)(value)) {
+    if (activeConfig.verbose) {
+      console.warn(`${value} - Theme is not a string`);
+    }
     return;
   }
-  const [name, ...modifier] = (0, import_utils11.isArray)(val) ? val : val.split(" ");
-  let value = CONFIG2.THEME[name];
-  if (value && (modifier || mod)) {
-    value = findModifier(value, modifier.length ? modifier : mod);
+  const [themeName, ...themeModifiers] = (0, import_utils11.isArray)(value) ? value : value.split(" ");
+  let themeValue = activeConfig.THEME[themeName];
+  if (themeValue && (themeModifiers || modifier)) {
+    themeValue = findModifier(themeValue, themeModifiers.length ? themeModifiers : modifier);
   }
-  const r = recursiveTheme(value);
-  return r;
+  const resolvedTheme = recursiveTheme(themeValue);
+  return resolvedTheme;
 };
 
 // src/system/reset.js

package/dist/cjs/system/shadow.js

@@ -1900,7 +1900,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};

package/dist/cjs/system/spacing.js

@@ -1808,7 +1808,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};

package/dist/cjs/system/theme.js

@@ -1941,20 +1941,22 @@ var findModifier = (val, modifier) => {
   else
     return val;
 };
-var getMediaTheme = (val, mod) => {
-  const CONFIG2 = getActiveConfig();
-  if ((0, import_utils11.isString)(val) && val.slice(0, 2) === "--")
-    val = getMediaTheme(val.slice(2));
-  if (!val || !(0, import_utils11.isString)(val)) {
-    if (CONFIG2.verbose)
-      console.warn(val, "- theme is not string");
+var getMediaTheme = (value, modifier) => {
+  const activeConfig = getActiveConfig();
+  if ((0, import_utils11.isString)(value) && value.slice(0, 2) === "--") {
+    value = getMediaTheme(value.slice(2));
+  }
+  if (!value || !(0, import_utils11.isString)(value)) {
+    if (activeConfig.verbose) {
+      console.warn(`${value} - Theme is not a string`);
+    }
     return;
   }
-  const [name, ...modifier] = (0, import_utils11.isArray)(val) ? val : val.split(" ");
-  let value = CONFIG2.THEME[name];
-  if (value && (modifier || mod)) {
-    value = findModifier(value, modifier.length ? modifier : mod);
+  const [themeName, ...themeModifiers] = (0, import_utils11.isArray)(value) ? value : value.split(" ");
+  let themeValue = activeConfig.THEME[themeName];
+  if (themeValue && (themeModifiers || modifier)) {
+    themeValue = findModifier(themeValue, themeModifiers.length ? themeModifiers : modifier);
   }
-  const r = recursiveTheme(value);
-  return r;
+  const resolvedTheme = recursiveTheme(themeValue);
+  return resolvedTheme;
 };

package/dist/cjs/system/timing.js

@@ -1800,7 +1800,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};

package/dist/cjs/system/typography.js

@@ -1799,7 +1799,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};

package/dist/cjs/transforms/index.js

@@ -211,12 +211,12 @@ var require_types = __commonJS({
       isDefined: () => isDefined2,
       isFunction: () => isFunction,
       isNot: () => isNot,
-      isNull: () => isNull,
+      isNull: () => isNull2,
       isNumber: () => isNumber3,
       isObject: () => isObject8,
       isObjectLike: () => isObjectLike3,
       isString: () => isString10,
-      isUndefined: () => isUndefined
+      isUndefined: () => isUndefined2
     });
     module2.exports = __toCommonJS2(types_exports);
     var import_node = require_node();
@@ -229,7 +229,7 @@ var require_types = __commonJS({
     var isNumber3 = (arg) => typeof arg === "number";
     var isFunction = (arg) => typeof arg === "function";
     var isBoolean = (arg) => arg === true || arg === false;
-    var isNull = (arg) => arg === null;
+    var isNull2 = (arg) => arg === null;
     var isArray9 = (arg) => Array.isArray(arg);
     var isDate = (d) => d instanceof Date;
     var isObjectLike3 = (arg) => {
@@ -238,9 +238,9 @@ var require_types = __commonJS({
       return typeof arg === "object";
     };
     var isDefined2 = (arg) => {
-      return isObject8(arg) || isObjectLike3(arg) || isString10(arg) || isNumber3(arg) || isFunction(arg) || isArray9(arg) || isObjectLike3(arg) || isBoolean(arg) || isDate(arg) || isNull(arg);
+      return isObject8(arg) || isObjectLike3(arg) || isString10(arg) || isNumber3(arg) || isFunction(arg) || isArray9(arg) || isObjectLike3(arg) || isBoolean(arg) || isDate(arg) || isNull2(arg);
     };
-    var isUndefined = (arg) => {
+    var isUndefined2 = (arg) => {
       return arg === void 0;
     };
     var TYPES = {
@@ -250,7 +250,7 @@ var require_types = __commonJS({
       string: isString10,
       date: isDate,
       number: isNumber3,
-      null: isNull,
+      null: isNull2,
       function: isFunction,
       objectLike: isObjectLike3,
       node: import_node.isNode,
@@ -1919,7 +1919,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};
@@ -2303,8 +2303,8 @@ var checkIfBoxSize = (propertyName) => {
   return (prop.includes("width") || prop.includes("height")) && !prop.includes("border");
 };
 var transformSize = (propertyName, val, props = {}, opts = {}) => {
-  let value = val !== void 0 ? val : props[propertyName];
-  if (value === void 0)
+  let value = val || props[propertyName];
+  if ((0, import_utils27.isUndefined)(value) && (0, import_utils27.isNull)(value))
     return;
   const shouldScaleBoxSize = props.scaleBoxSize;
   const isBoxSize = checkIfBoxSize(propertyName);

package/dist/cjs/utils/index.js

@@ -2035,7 +2035,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};

package/dist/cjs/utils/sequence.js

@@ -1763,7 +1763,7 @@ var getSequenceValue = (value = "A", sequenceProps) => {
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== "string") {
     console.warn(propertyName, value, "is not a string");
-    return {};
+    return { [propertyName]: value };
   }
   if (value === "-" || value === "")
     return {};

package/package.json

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

package/src/system/theme.js

@@ -221,21 +221,27 @@ const checkForReference = (val, callback) => {
 
 const checkThemeReference = (val) => checkForReference(val, checkThemeReference) // eslint-disable-line
 
-export const getMediaTheme = (val, mod) => {
-  const CONFIG = getActiveConfig()
-  if (isString(val) && val.slice(0, 2) === '--') val = getMediaTheme(val.slice(2))
+export const getMediaTheme = (value, modifier) => {
+  const activeConfig = getActiveConfig()
+
+  if (isString(value) && value.slice(0, 2) === '--') {
+    value = getMediaTheme(value.slice(2))
+  }
 
-  if (!val || !isString(val)) {
-    if (CONFIG.verbose) console.warn(val, '- theme is not string')
+  if (!value || !isString(value)) {
+    if (activeConfig.verbose) {
+      console.warn(`${value} - Theme is not a string`)
+    }
     return
   }
 
-  const [name, ...modifier] = isArray(val) ? val : val.split(' ')
-  let value = CONFIG.THEME[name]
-  if (value && (modifier || mod)) {
-    value = findModifier(value, modifier.length ? modifier : mod)
+  const [themeName, ...themeModifiers] = isArray(value) ? value : value.split(' ')
+  let themeValue = activeConfig.THEME[themeName]
+
+  if (themeValue && (themeModifiers || modifier)) {
+    themeValue = findModifier(themeValue, themeModifiers.length ? themeModifiers : modifier)
   }
 
-  const r = recursiveTheme(value)
-  return r
+  const resolvedTheme = recursiveTheme(themeValue)
+  return resolvedTheme
 }

package/src/transforms/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isString } from '@domql/utils'
+import { isNull, isString, isUndefined } from '@domql/utils'
 import { getActiveConfig } from '../factory'
 import {
   getSpacingByKey,
@@ -112,9 +112,9 @@ export const checkIfBoxSize = propertyName => {
 }
 
 export const transformSize = (propertyName, val, props = {}, opts = {}) => {
-  let value = val !== undefined ? val : props[propertyName]
+  let value = val || props[propertyName]
 
-  if (value === undefined) return
+  if (isUndefined(value) && isNull(value)) return
 
   const shouldScaleBoxSize = props.scaleBoxSize
   const isBoxSize = checkIfBoxSize(propertyName)

package/src/utils/sequence.js

@@ -249,7 +249,7 @@ export const getSequenceValue = (value = 'A', sequenceProps) => {
 export const getSequenceValuePropertyPair = (value, propertyName, sequenceProps) => {
   if (typeof value !== 'string') {
     console.warn(propertyName, value, 'is not a string')
-    return ({})
+    return ({ [propertyName]: value })
   }
   if (value === '-' || value === '') return ({})
   return { [propertyName]: getSequenceValue(value, sequenceProps) }