@symbo.ls/scratch 2.10.163 → 2.10.168

package/dist/cjs/system/document.js

@@ -21,14 +21,15 @@ __export(document_exports, {
   applyDocument: () => applyDocument
 });
 module.exports = __toCommonJS(document_exports);
+var import_utils = require("@domql/utils");
 var import_factory = require("../factory.js");
-var import_utils = require("../utils");
+var import_utils2 = require("../utils");
 const applyDocument = () => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { DOCUMENT, FONT_FAMILY, THEME, TYPOGRAPHY } = CONFIG;
   return (0, import_utils.merge)(DOCUMENT, {
     theme: THEME.document,
-    fontFamily: (0, import_utils.getDefaultOrFirstKey)(FONT_FAMILY),
+    fontFamily: (0, import_utils2.getDefaultOrFirstKey)(FONT_FAMILY),
     fontSize: TYPOGRAPHY.base,
     lineHeight: TYPOGRAPHY.lineHeight
   });

package/dist/cjs/system/font.js

@@ -24,17 +24,18 @@ __export(font_exports, {
 });
 module.exports = __toCommonJS(font_exports);
 var import_utils = require("@domql/utils");
+var import_utils2 = require("@symbo.ls/utils");
 var import_factory = require("../factory.js");
-var import_utils2 = require("../utils");
+var import_utils3 = require("../utils");
 const setFont = (val, key) => {
   const CSSvar = `--font-${key}`;
-  const fontFace = val[0] ? (0, import_utils2.getFontFaceEach)(key, val) : (0, import_utils2.setCustomFontMedia)(key, val.url);
+  const fontFace = val[0] ? (0, import_utils3.getFontFaceEach)(key, val) : (0, import_utils3.setCustomFontMedia)(key, val.url);
   return { var: CSSvar, value: val, fontFace };
 };
 const getFontFamily = (key, factory) => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { FONT_FAMILY } = CONFIG;
-  return (0, import_utils2.getDefaultOrFirstKey)(factory || FONT_FAMILY, key);
+  return (0, import_utils3.getDefaultOrFirstKey)(factory || FONT_FAMILY, key);
 };
 const setFontFamily = (val, key) => {
   const CONFIG = (0, import_factory.getActiveConfig)();
@@ -43,7 +44,7 @@ const setFontFamily = (val, key) => {
   if (val.isDefault)
     FONT_FAMILY.default = key;
   if ((0, import_utils.isObject)(value))
-    value = (0, import_utils2.arrayze)(value);
+    value = (0, import_utils2.arrayzeValue)(value);
   const CSSvar = `--font-family-${key}`;
   const str = `${value.join(", ")}, ${FONT_FAMILY_TYPES[type]}`;
   return { var: CSSvar, value: str, arr: value, type };

package/dist/cjs/system/reset.js

@@ -21,9 +21,9 @@ __export(reset_exports, {
   applyReset: () => applyReset
 });
 module.exports = __toCommonJS(reset_exports);
+var import_utils = require("@domql/utils");
 var import_factory = require("../factory.js");
 var import__ = require(".");
-var import_utils = require("@domql/utils");
 const applyReset = (reset = {}) => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { CSS_VARS, RESET, TYPOGRAPHY, DOCUMENT } = CONFIG;

package/dist/cjs/system/spacing.js

@@ -23,9 +23,10 @@ __export(spacing_exports, {
   getSpacingByKey: () => getSpacingByKey
 });
 module.exports = __toCommonJS(spacing_exports);
+var import_utils = require("@symbo.ls/utils");
+var import_utils2 = require("@domql/utils");
 var import_factory = require("../factory.js");
-var import_utils = require("@domql/utils");
-var import_utils2 = require("../utils");
+var import_utils3 = require("../utils");
 const runThroughMedia = (sequenceProps) => {
   for (const prop in sequenceProps) {
     const mediaProps = sequenceProps[prop];
@@ -44,17 +45,17 @@ const runThroughMedia = (sequenceProps) => {
         templates: {},
         vars: {}
       });
-      (0, import_utils2.generateSequence)(mediaProps);
+      (0, import_utils3.generateSequence)(mediaProps);
       const mediaName = prop.slice(1);
-      (0, import_utils2.applySequenceVars)(mediaProps, mediaName);
+      (0, import_utils3.applySequenceVars)(mediaProps, mediaName);
     }
   }
 };
 const applySpacingSequence = () => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { SPACING } = CONFIG;
-  (0, import_utils2.generateSequence)(SPACING);
-  (0, import_utils2.applySequenceVars)(SPACING);
+  (0, import_utils3.generateSequence)(SPACING);
+  (0, import_utils3.applySequenceVars)(SPACING);
   runThroughMedia(SPACING);
 };
 const getSequence = (sequenceProps) => {
@@ -63,14 +64,14 @@ const getSequence = (sequenceProps) => {
   if (!sequenceProps)
     return SPACING;
   const hasGenerated = Object.keys(sequenceProps.sequence).length > 0;
-  return hasGenerated ? sequenceProps : (0, import_utils2.generateSequence)(sequenceProps);
+  return hasGenerated ? sequenceProps : (0, import_utils3.generateSequence)(sequenceProps);
 };
 const getSpacingByKey = (value, propertyName = "padding", sequenceProps) => {
   const sequence = getSequence(sequenceProps);
-  const stack = (0, import_utils2.arrayze)(value);
+  const stack = (0, import_utils.arrayzeValue)(value);
   if (!stack)
     return;
-  if ((0, import_utils.isString)(value) && value.includes("calc")) {
+  if ((0, import_utils2.isString)(value) && value.includes("calc")) {
     return { [propertyName]: value };
   }
   if (stack.length > 1) {
@@ -84,14 +85,14 @@ const getSpacingByKey = (value, propertyName = "padding", sequenceProps) => {
       3: ["BlockStart", "Inline", "BlockEnd"],
       4: ["BlockStart", "InlineEnd", "BlockEnd", "InlineStart"]
     };
-    const wrapSequenceValueByDirection = (direction, i) => (0, import_utils2.getSequenceValuePropertyPair)(
+    const wrapSequenceValueByDirection = (direction, i) => (0, import_utils3.getSequenceValuePropertyPair)(
       stack[i],
       propertyName + direction + suffix,
       sequence
     );
     return directions[stack.length].map((dir, key) => wrapSequenceValueByDirection(dir, key));
   }
-  return (0, import_utils2.getSequenceValuePropertyPair)(
+  return (0, import_utils3.getSequenceValuePropertyPair)(
     value,
     propertyName,
     sequence
@@ -122,7 +123,7 @@ const getSpacingBasedOnRatio = (props, propertyName, val) => {
         unit: SPACING.unit
       });
     }
-    (0, import_utils2.applySequenceVars)(sequenceProps, null, { useDefault: false });
+    (0, import_utils3.applySequenceVars)(sequenceProps, null, { useDefault: false });
     return getSpacingByKey(value, propertyName, sequenceProps);
   }
   return getSpacingByKey(value, propertyName);

package/dist/cjs/system/typography.js

@@ -24,8 +24,9 @@ __export(typography_exports, {
   runThroughMedia: () => runThroughMedia
 });
 module.exports = __toCommonJS(typography_exports);
+var import_utils = require("@domql/utils");
 var import_factory = require("../factory.js");
-var import_utils = require("../utils");
+var import_utils2 = require("../utils");
 const runThroughMedia = (props) => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { TYPOGRAPHY, MEDIA } = CONFIG;
@@ -46,9 +47,9 @@ const runThroughMedia = (props) => {
         templates: {},
         vars: {}
       });
-      (0, import_utils.generateSequence)(mediaProps);
+      (0, import_utils2.generateSequence)(mediaProps);
       const mediaName = prop.slice(1);
-      (0, import_utils.applySequenceVars)(mediaProps, mediaName);
+      (0, import_utils2.applySequenceVars)(mediaProps, mediaName);
       const query = MEDIA[mediaName];
       TYPOGRAPHY.templates[`@media screen and ${query}`] = {
         fontSize: mediaProps.base / TYPOGRAPHY.browserDefault + unit
@@ -60,7 +61,7 @@ const applyHeadings = (props) => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   if (props.h1Matches) {
     const unit = props.unit;
-    const HEADINGS = (0, import_utils.findHeadings)(props);
+    const HEADINGS = (0, import_utils2.findHeadings)(props);
     const { templates } = props;
     for (const k in HEADINGS) {
       const headerName = `h${parseInt(k) + 1}`;
@@ -78,15 +79,15 @@ const applyHeadings = (props) => {
 const applyTypographySequence = () => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { TYPOGRAPHY } = CONFIG;
-  (0, import_utils.generateSequence)(TYPOGRAPHY);
+  (0, import_utils2.generateSequence)(TYPOGRAPHY);
   applyHeadings(TYPOGRAPHY);
-  (0, import_utils.applySequenceVars)(TYPOGRAPHY);
+  (0, import_utils2.applySequenceVars)(TYPOGRAPHY);
   runThroughMedia(TYPOGRAPHY);
 };
 const getFontSizeByKey = (value) => {
   const CONFIG = (0, import_factory.getActiveConfig)();
   const { TYPOGRAPHY } = CONFIG;
-  return (0, import_utils.getSequenceValuePropertyPair)(
+  return (0, import_utils2.getSequenceValuePropertyPair)(
     value,
     "fontSize",
     TYPOGRAPHY

package/dist/cjs/utils/index.js

@@ -15,7 +15,6 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
-__reExport(utils_exports, require("./object.js"), module.exports);
 __reExport(utils_exports, require("./color.js"), module.exports);
 __reExport(utils_exports, require("./font.js"), module.exports);
 __reExport(utils_exports, require("./sequence.js"), module.exports);

package/package.json

@@ -2,17 +2,17 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.10.163",
+  "version": "2.10.168",
   "files": [
     "src",
     "dist"
   ],
   "repository": "https://github.com/symbo-ls/scratch",
   "type": "module",
-  "module": "index.js",
+  "module": "src/index.js",
   "unpkg": "dist/iife/index.js",
   "jsdelivr": "dist/iife/index.js",
-  "main": "index.js",
+  "main": "src/index.js",
   "exports": "./dist/cjs/index.js",
   "source": "src/index.js",
   "publishConfig": {},
@@ -36,5 +36,5 @@
     "> 1%",
     "ie >= 9"
   ],
-  "gitHead": "9b654d48bb8ba26e3b1b7095b5ed7b813b61e1e0"
+  "gitHead": "c9937422aa846691fa6187c7a3975c313114617a"
 }

package/src/system/document.js

@@ -1,7 +1,8 @@
 'use strict'
 
+import { merge } from '@domql/utils'
 import { getActiveConfig } from '../factory.js'
-import { getDefaultOrFirstKey, merge } from '../utils'
+import { getDefaultOrFirstKey } from '../utils'
 
 export const applyDocument = () => {
   const CONFIG = getActiveConfig()

package/src/system/font.js

@@ -1,10 +1,10 @@
 'use strict'
 
 import { isObject } from '@domql/utils'
+import { arrayzeValue } from '@symbo.ls/utils'
 import { getActiveConfig } from '../factory.js'
 
 import {
-  arrayze,
   getDefaultOrFirstKey,
   getFontFaceEach,
   setCustomFontMedia
@@ -32,7 +32,7 @@ export const setFontFamily = (val, key) => {
   let { value, type } = val
   if (val.isDefault) FONT_FAMILY.default = key
 
-  if (isObject(value)) value = arrayze(value)
+  if (isObject(value)) value = arrayzeValue(value)
 
   const CSSvar = `--font-family-${key}`
   const str = `${value.join(', ')}, ${FONT_FAMILY_TYPES[type]}`

package/src/system/reset.js

@@ -1,8 +1,8 @@
 'use strict'
 
+import { deepMerge, merge } from '@domql/utils'
 import { getActiveConfig } from '../factory.js'
 import { getMediaTheme } from '.'
-import { deepMerge, merge } from '@domql/utils' // eslint-disable-line no-unused-vars
 
 export const applyReset = (reset = {}) => {
   const CONFIG = getActiveConfig()

package/src/system/spacing.js

@@ -1,14 +1,13 @@
 'use strict'
 
-import { getActiveConfig } from '../factory.js'
+import { arrayzeValue } from '@symbo.ls/utils'
+import { isString, merge } from '@domql/utils'
 
-import { isString } from '@domql/utils'
+import { getActiveConfig } from '../factory.js'
 import {
   applySequenceVars,
-  arrayze,
   generateSequence,
-  getSequenceValuePropertyPair,
-  merge
+  getSequenceValuePropertyPair
 } from '../utils'
 
 const runThroughMedia = sequenceProps => {
@@ -62,7 +61,7 @@ export const getSpacingByKey = (
 ) => {
   const sequence = getSequence(sequenceProps)
 
-  const stack = arrayze(value)
+  const stack = arrayzeValue(value)
   if (!stack) return
 
   if (isString(value) && value.includes('calc')) {

package/src/system/typography.js

@@ -1,13 +1,13 @@
 'use strict'
 
+import { merge } from '@domql/utils'
 import { getActiveConfig } from '../factory.js'
 
 import {
   applySequenceVars,
   findHeadings,
   generateSequence,
-  getSequenceValuePropertyPair,
-  merge
+  getSequenceValuePropertyPair
 } from '../utils'
 
 export const runThroughMedia = props => {

package/src/utils/index.js

@@ -1,8 +1,7 @@
 'use strict'
 
-export * from './object.js'
 export * from './color.js'
 export * from './font.js'
 export * from './sequence.js'
 export * from './var.js'
-export * from './sprite.js'
+export * from './sprite.js'

package/dist/cjs/utils/object.js

@@ -1,73 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var object_exports = {};
-__export(object_exports, {
-  arrayze: () => arrayze,
-  deepMerge: () => deepMerge,
-  isArray: () => isArray,
-  isFunction: () => isFunction,
-  isObject: () => isObject,
-  isObjectLike: () => isObjectLike,
-  isString: () => isString,
-  merge: () => merge
-});
-module.exports = __toCommonJS(object_exports);
-const isString = (arg) => typeof arg === "string";
-const isArray = (arg) => Array.isArray(arg);
-const isObject = (arg) => {
-  if (arg === null)
-    return false;
-  return typeof arg === "object" && arg.constructor === Object;
-};
-const isObjectLike = (arg) => {
-  if (arg === null)
-    return false;
-  return typeof arg === "object";
-};
-const merge = (obj, original) => {
-  for (const e in original) {
-    const objProp = obj[e];
-    const originalProp = original[e];
-    if (objProp === void 0) {
-      obj[e] = originalProp;
-    }
-  }
-  return obj;
-};
-const deepMerge = (obj, obj2) => {
-  for (const e in obj2) {
-    const objProp = obj[e];
-    const obj2Prop = obj2[e];
-    if (objProp === void 0) {
-      obj[e] = obj2Prop;
-    } else if (isObjectLike(objProp) && isObject(obj2Prop)) {
-      deepMerge(objProp, obj2Prop);
-    }
-  }
-  return obj;
-};
-const arrayze = (val) => {
-  if (isString(val))
-    return val.split(" ");
-  if (isObject(val))
-    return Object.keys(val).map((v) => val[v]);
-  if (isArray(val))
-    return val;
-};
-const isFunction = (arg) => typeof arg === "function";

package/src/utils/object.js

@@ -1,47 +0,0 @@
-'use strict'
-
-export const isString = arg => typeof arg === 'string'
-
-export const isArray = arg => Array.isArray(arg)
-
-export const isObject = arg => {
-  if (arg === null) return false
-  return (typeof arg === 'object') && (arg.constructor === Object)
-}
-
-export const isObjectLike = arg => {
-  if (arg === null) return false
-  return (typeof arg === 'object')
-}
-
-export const merge = (obj, original) => {
-  for (const e in original) {
-    const objProp = obj[e]
-    const originalProp = original[e]
-    if (objProp === undefined) {
-      obj[e] = originalProp
-    }
-  }
-  return obj
-}
-
-export const deepMerge = (obj, obj2) => {
-  for (const e in obj2) {
-    const objProp = obj[e]
-    const obj2Prop = obj2[e]
-    if (objProp === undefined) {
-      obj[e] = obj2Prop
-    } else if (isObjectLike(objProp) && isObject(obj2Prop)) {
-      deepMerge(objProp, obj2Prop)
-    }
-  }
-  return obj
-}
-
-export const arrayze = val => {
-  if (isString(val)) return val.split(' ')
-  if (isObject(val)) return Object.keys(val).map(v => val[v])
-  if (isArray(val)) return val
-}
-
-export const isFunction = arg => typeof arg === 'function'