@symbo.ls/scratch 2.33.27 → 2.33.29

package/dist/cjs/index.js

@@ -616,6 +616,27 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+function exec(param, element, state, context, opts = {}) {
+  if (!element) element = this;
+  if (isFunction(param)) {
+    try {
+      const result = param.call(
+        element,
+        element,
+        state || element.state,
+        context || element.context
+      );
+      if (result && typeof result.then === "function") {
+        return result;
+      }
+      return result;
+    } catch (e) {
+      element.log(param);
+      element.warn("Error executing function", e, opts);
+    }
+  }
+  return param;
+}
 var merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
     const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, e);
@@ -1398,7 +1419,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {
@@ -2459,8 +2480,8 @@ var splitTransition = (transition) => {
   if (!arr.length) return;
   return arr.map(transformTransition).join(",");
 };
-var transformSize = (propertyName, val, props = {}, opts = {}) => {
-  let value = val || props[propertyName];
+function transformSize(propertyName, val, props = {}, opts = {}) {
+  let value = exec.call(this, val || props[propertyName]);
   if (isUndefined(value) && isNull(value)) return;
   let fnPrefix;
   if (isString(value)) {
@@ -2476,12 +2497,12 @@ var transformSize = (propertyName, val, props = {}, opts = {}) => {
     }
   }
   return opts.ratio ? getSpacingBasedOnRatio(props, propertyName, value, fnPrefix) : getSpacingByKey(value, propertyName, void 0, fnPrefix);
-};
-var transformSizeRatio = (propertyName, props) => {
+}
+function transformSizeRatio(propertyName, props) {
   return transformSize(propertyName, null, props, {
     ratio: true
   });
-};
+}
 
 // src/set.js
 var setCases = (val, key) => {

package/dist/cjs/set.js

@@ -1104,7 +1104,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/system/index.js

@@ -1125,7 +1125,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/system/shadow.js

@@ -1033,7 +1033,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/system/spacing.js

@@ -962,7 +962,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/system/timing.js

@@ -947,7 +947,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/system/typography.js

@@ -960,7 +960,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/transforms/index.js

@@ -385,6 +385,27 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+function exec(param, element, state, context, opts = {}) {
+  if (!element) element = this;
+  if (isFunction(param)) {
+    try {
+      const result = param.call(
+        element,
+        element,
+        state || element.state,
+        context || element.context
+      );
+      if (result && typeof result.then === "function") {
+        return result;
+      }
+      return result;
+    } catch (e) {
+      element.log(param);
+      element.warn("Error executing function", e, opts);
+    }
+  }
+  return param;
+}
 var deepMerge = (element, extend, excludeFrom = [], level = Infinity) => {
   for (const e in extend) {
     const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(extend, e);
@@ -1042,7 +1063,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {
@@ -1355,8 +1376,8 @@ var splitTransition = (transition) => {
   if (!arr.length) return;
   return arr.map(transformTransition).join(",");
 };
-var transformSize = (propertyName, val, props = {}, opts = {}) => {
-  let value = val || props[propertyName];
+function transformSize(propertyName, val, props = {}, opts = {}) {
+  let value = exec.call(this, val || props[propertyName]);
   if (isUndefined(value) && isNull(value)) return;
   let fnPrefix;
   if (isString(value)) {
@@ -1372,10 +1393,10 @@ var transformSize = (propertyName, val, props = {}, opts = {}) => {
     }
   }
   return opts.ratio ? getSpacingBasedOnRatio(props, propertyName, value, fnPrefix) : getSpacingByKey(value, propertyName, void 0, fnPrefix);
-};
-var transformSizeRatio = (propertyName, props) => {
+}
+function transformSizeRatio(propertyName, props) {
   return transformSize(propertyName, null, props, {
     ratio: true
   });
-};
+}
 // @preserve-env

package/dist/cjs/utils/index.js

@@ -1208,7 +1208,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/dist/cjs/utils/sequence.js

@@ -992,7 +992,7 @@ var getSequenceValueBySymbols = (value, sequenceProps) => {
     const transformedValues = valuesArr.map((v) => {
       return getSequenceValue(v, sequenceProps);
     });
-    return transformedValues.join(symbol + " ");
+    return transformedValues.join(" " + symbol + " ");
   }).join("");
 };
 var getSequenceValuePropertyPair = (value, propertyName, sequenceProps, fnPrefix) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.33.27",
+  "version": "2.33.29",
   "files": [
     "src",
     "dist"
@@ -25,9 +25,9 @@
     "prepublish": "rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/utils": "^2.33.27",
-    "@symbo.ls/utils": "^2.33.27",
+    "@domql/utils": "^2.33.29",
+    "@symbo.ls/utils": "^2.33.29",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "305c78c0cd824b365d3e464dc3ede6b250c8baf1"
+  "gitHead": "4a29b29c86a47fa047345b16120cc426bbe57f41"
 }

package/src/transforms/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isNull, isString, isObject, isUndefined } from '@domql/utils'
+import { isNull, isString, isObject, isUndefined, exec } from '@domql/utils'
 import { getActiveConfig } from '../factory'
 import {
   getSpacingByKey,
@@ -145,8 +145,8 @@ export const splitTransition = (transition) => {
   return arr.map(transformTransition).join(',')
 }
 
-export const transformSize = (propertyName, val, props = {}, opts = {}) => {
-  let value = val || props[propertyName]
+export function transformSize(propertyName, val, props = {}, opts = {}) {
+  let value = exec.call(this, val || props[propertyName])
 
   if (isUndefined(value) && isNull(value)) return
 
@@ -171,7 +171,7 @@ export const transformSize = (propertyName, val, props = {}, opts = {}) => {
     : getSpacingByKey(value, propertyName, undefined, fnPrefix)
 }
 
-export const transformSizeRatio = (propertyName, props) => {
+export function transformSizeRatio(propertyName, props) {
   return transformSize(propertyName, null, props, {
     ratio: true
   })

package/src/utils/sequence.js

@@ -321,7 +321,7 @@ export const getSequenceValueBySymbols = (value, sequenceProps) => {
       const transformedValues = valuesArr.map((v) => {
         return getSequenceValue(v, sequenceProps)
       })
-      return transformedValues.join(symbol + ' ')
+      return transformedValues.join(' ' + symbol + ' ')
     })
     .join('')
 }

package/src/utils/sprite.js

@@ -5,7 +5,7 @@ import { getActiveConfig } from '../factory'
 
 const isDev = isNotProduction()
 
-export const generateSprite = icons => {
+export const generateSprite = (icons) => {
   const CONFIG = getActiveConfig()
 
   let sprite = ''
@@ -19,7 +19,7 @@ export const generateSprite = icons => {
   return sprite
 }
 
-const parseRootAttributes = htmlString => {
+const parseRootAttributes = (htmlString) => {
   const val = htmlString.default || htmlString
   if (!isString(val)) {
     if (isDev) console.warn('parseRootAttributes:', val, 'is not a string')