@symbo.ls/scratch 2.11.228 → 2.11.234

package/dist/cjs/utils/sprite.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../../domql/packages/utils/dist/cjs/key.js
+// ../../node_modules/@domql/utils/dist/cjs/key.js
 var require_key = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/key.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/key.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -69,9 +69,9 @@ var require_key = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/env.js
+// ../../node_modules/@domql/utils/dist/cjs/env.js
 var require_env = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/env.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/env.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -107,9 +107,9 @@ var require_env = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/globals.js
+// ../../node_modules/@domql/utils/dist/cjs/globals.js
 var require_globals = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/globals.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/globals.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -143,9 +143,9 @@ var require_globals = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/node.js
+// ../../node_modules/@domql/utils/dist/cjs/node.js
 var require_node = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/node.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/node.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -180,9 +180,9 @@ var require_node = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/types.js
+// ../../node_modules/@domql/utils/dist/cjs/types.js
 var require_types = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/types.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/types.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -270,9 +270,9 @@ var require_types = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/array.js
+// ../../node_modules/@domql/utils/dist/cjs/array.js
 var require_array = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/array.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/array.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -383,9 +383,9 @@ var require_array = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/string.js
+// ../../node_modules/@domql/utils/dist/cjs/string.js
 var require_string = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/string.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/string.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -443,9 +443,9 @@ var require_string = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/object.js
+// ../../node_modules/@domql/utils/dist/cjs/object.js
 var require_object = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/object.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/object.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -935,9 +935,9 @@ var require_object = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/function.js
+// ../../node_modules/@domql/utils/dist/cjs/function.js
 var require_function = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/function.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/function.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1010,9 +1010,9 @@ var require_function = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/log.js
+// ../../node_modules/@domql/utils/dist/cjs/log.js
 var require_log = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/log.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/log.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1051,9 +1051,9 @@ var require_log = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/cookie.js
+// ../../node_modules/@domql/utils/dist/cjs/cookie.js
 var require_cookie = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/cookie.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/cookie.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1107,9 +1107,9 @@ var require_cookie = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/tags.js
+// ../../node_modules/@domql/utils/dist/cjs/tags.js
 var require_tags = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/tags.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/tags.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1272,9 +1272,9 @@ var require_tags = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/index.js
+// ../../node_modules/@domql/utils/dist/cjs/index.js
 var require_cjs = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/index.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/index.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;

package/dist/cjs/utils/unit.js

@@ -0,0 +1,28 @@
+"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);
+
+// src/utils/unit.js
+var unit_exports = {};
+__export(unit_exports, {
+  isScalingUnit: () => isScalingUnit
+});
+module.exports = __toCommonJS(unit_exports);
+var isScalingUnit = (unit) => {
+  return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
+};

package/dist/cjs/utils/var.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../../domql/packages/utils/dist/cjs/key.js
+// ../../node_modules/@domql/utils/dist/cjs/key.js
 var require_key = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/key.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/key.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -69,9 +69,9 @@ var require_key = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/env.js
+// ../../node_modules/@domql/utils/dist/cjs/env.js
 var require_env = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/env.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/env.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -107,9 +107,9 @@ var require_env = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/globals.js
+// ../../node_modules/@domql/utils/dist/cjs/globals.js
 var require_globals = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/globals.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/globals.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -143,9 +143,9 @@ var require_globals = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/node.js
+// ../../node_modules/@domql/utils/dist/cjs/node.js
 var require_node = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/node.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/node.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -180,9 +180,9 @@ var require_node = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/types.js
+// ../../node_modules/@domql/utils/dist/cjs/types.js
 var require_types = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/types.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/types.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -270,9 +270,9 @@ var require_types = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/array.js
+// ../../node_modules/@domql/utils/dist/cjs/array.js
 var require_array = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/array.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/array.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -383,9 +383,9 @@ var require_array = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/string.js
+// ../../node_modules/@domql/utils/dist/cjs/string.js
 var require_string = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/string.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/string.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -443,9 +443,9 @@ var require_string = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/object.js
+// ../../node_modules/@domql/utils/dist/cjs/object.js
 var require_object = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/object.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/object.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -935,9 +935,9 @@ var require_object = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/function.js
+// ../../node_modules/@domql/utils/dist/cjs/function.js
 var require_function = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/function.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/function.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1010,9 +1010,9 @@ var require_function = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/log.js
+// ../../node_modules/@domql/utils/dist/cjs/log.js
 var require_log = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/log.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/log.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1051,9 +1051,9 @@ var require_log = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/cookie.js
+// ../../node_modules/@domql/utils/dist/cjs/cookie.js
 var require_cookie = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/cookie.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/cookie.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1107,9 +1107,9 @@ var require_cookie = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/tags.js
+// ../../node_modules/@domql/utils/dist/cjs/tags.js
 var require_tags = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/tags.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/tags.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1272,9 +1272,9 @@ var require_tags = __commonJS({
   }
 });
 
-// ../../../domql/packages/utils/dist/cjs/index.js
+// ../../node_modules/@domql/utils/dist/cjs/index.js
 var require_cjs = __commonJS({
-  "../../../domql/packages/utils/dist/cjs/index.js"(exports, module2) {
+  "../../node_modules/@domql/utils/dist/cjs/index.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1557,6 +1557,11 @@ var import_utils3 = __toESM(require_cjs());
 // ../utils/src/scaling.js
 var import_utils2 = __toESM(require_cjs());
 
+// src/utils/unit.js
+var isScalingUnit = (unit) => {
+  return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
+};
+
 // src/utils/sequence.js
 var getSubratioDifference = (base, ratio) => {
   const diff = base * ratio - base;
@@ -1590,9 +1595,9 @@ var applyGlobalVars = (vars, obj, options) => {
   const ratioVar = `${prefix}-ratio`;
   vars[ratioVar] = ratio;
   const [first, middle, second] = getSubratio(base, ratio);
-  vars[`${prefix}-sub-ratio-1`] = first;
-  vars[`${prefix}-sub-ratio-2`] = middle;
-  vars[`${prefix}-sub-ratio-3`] = second;
+  vars[`${prefix}-sub-ratio-1`] = `calc(var(${prefix}-ratio) * ${first / ratio})`;
+  vars[`${prefix}-sub-ratio-2`] = `calc(var(${prefix}-ratio) * ${middle / ratio})`;
+  vars[`${prefix}-sub-ratio-3`] = `calc(var(${prefix}-ratio) * ${second / ratio})`;
 };
 var applySequenceVars = (FACTORY2, options = {}) => {
   const CONFIG2 = getActiveConfig();
@@ -1620,7 +1625,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
 };
 var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
   const CONFIG2 = getActiveConfig();
-  const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
+  const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
   const mediaName = media.slice(1);
   const unit = FACTORY2.unit || UNIT2.default;
   const { mediaRegenerate } = FACTORY2;
@@ -1637,7 +1642,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
   }
   for (const key in sequence) {
     const item = sequence[key];
-    const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
+    const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
     if (!query && CONFIG2.verbose)
       console.warn("Can't find query ", query);
     let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -1646,5 +1651,4 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
     underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
     CSS_VARS2[item.variable + "_" + mediaName] = value;
   }
-  console.log(CSS_VARS2);
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.228",
+  "version": "2.11.234",
   "files": [
     "src",
     "dist"
@@ -29,5 +29,5 @@
     "@symbo.ls/utils": "latest",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "56d2e29e73842899b56b329d61abf5f75e27cc7c"
+  "gitHead": "16ba231199a1a519fa482541824c9820630f826e"
 }

package/src/utils/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+export * from './unit.js'
 export * from './color.js'
 export * from './theme.js'
 export * from './font.js'

package/src/utils/sequence.js

@@ -3,6 +3,7 @@
 import { isString } from '@domql/utils'
 import { toDashCase } from '@symbo.ls/utils'
 import { getActiveConfig } from '../factory.js'
+import { isScalingUnit } from './unit.js'
 
 export const numToLetterMap = {
   '-6': 'U',
@@ -49,8 +50,11 @@ const setSequenceValue = (props, sequenceProps) => {
 }
 
 export const setScalingVar = (key, sequenceProps) => {
-  const { type } = sequenceProps
-  if (key === 0) return '1em'
+  const { base, type, unit } = sequenceProps
+
+  const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit
+
+  if (key === 0) return defaultVal
 
   const prefix = '--' + (type && type.replace('.', '-'))
   const ratioVar = `${prefix}-ratio`

package/src/utils/unit.js

@@ -0,0 +1,5 @@
+'use strict'
+
+export const isScalingUnit = unit => {
+  return unit === 'em' || unit === 'rem' || unit === 'vw' || unit === 'vh' || unit === 'vmax' || unit === 'vmin'
+}

package/src/utils/var.js

@@ -3,6 +3,7 @@
 import { isObjectLike } from '@domql/utils'
 import { getActiveConfig } from '../factory.js'
 import { getSubratio } from './sequence.js'
+import { isScalingUnit } from './unit.js'
 
 export const setVariables = (result, key) => {
   const CONFIG = getActiveConfig()
@@ -27,9 +28,12 @@ export const applyGlobalVars = (vars, obj, options) => {
   vars[ratioVar] = ratio
 
   const [first, middle, second] = getSubratio(base, ratio)
-  vars[`${prefix}-sub-ratio-1`] = first
-  vars[`${prefix}-sub-ratio-2`] = middle
-  vars[`${prefix}-sub-ratio-3`] = second
+  vars[`${prefix}-sub-ratio-1`] = `calc(var(${prefix}-ratio) * ${first / ratio})`
+  vars[`${prefix}-sub-ratio-2`] = `calc(var(${prefix}-ratio) * ${middle / ratio})`
+  vars[`${prefix}-sub-ratio-3`] = `calc(var(${prefix}-ratio) * ${second / ratio})`
+  // vars[`${prefix}-sub-ratio-1`] = first
+  // vars[`${prefix}-sub-ratio-2`] = middle
+  // vars[`${prefix}-sub-ratio-3`] = second
 }
 
 export const applySequenceVars = (FACTORY, options = {}) => {
@@ -68,7 +72,7 @@ export const applySequenceVars = (FACTORY, options = {}) => {
 
 export const applyMediaSequenceVars = (FACTORY, media, options = {}) => {
   const CONFIG = getActiveConfig()
-  const { UNIT, MEDIA, TIMING, CSS_VARS } = CONFIG
+  const { UNIT, MEDIA, CSS_VARS } = CONFIG
 
   const mediaName = media.slice(1)
 
@@ -91,9 +95,9 @@ export const applyMediaSequenceVars = (FACTORY, media, options = {}) => {
   for (const key in sequence) {
     const item = sequence[key]
 
-    const value = (FACTORY.type === TIMING.type
-      ? sequence[key].val
-      : scales[key]
+    const value = (isScalingUnit(unit)
+      ? scales[key]
+      : sequence[key].val
     ) + unit
 
     if (!query && CONFIG.verbose) console.warn('Can\'t find query ', query)
@@ -104,6 +108,4 @@ export const applyMediaSequenceVars = (FACTORY, media, options = {}) => {
     underMediaQuery[item.variable] = `var(${item.variable + '_' + mediaName})`
     CSS_VARS[item.variable + '_' + mediaName] = value
   }
-
-  console.log(CSS_VARS)
 }