@symbo.ls/scratch 3.0.1 → 3.1.1

package/dist/cjs/utils/var.js

@@ -34,23 +34,23 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var require_cjs = __commonJS({
   "../utils/dist/cjs/index.js"(exports, module2) {
     "use strict";
-    var __defProp3 = Object.defineProperty;
+    var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp3 = Object.prototype.hasOwnProperty;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
     var __export2 = (target, all) => {
       for (var name in all)
-        __defProp3(target, name, { get: all[name], enumerable: true });
+        __defProp2(target, name, { get: all[name], enumerable: true });
     };
     var __copyProps2 = (to, from, except, desc) => {
       if (from && typeof from === "object" || typeof from === "function") {
         for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp3.call(to, key) && key !== except)
-            __defProp3(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
       }
       return to;
     };
-    var __toCommonJS2 = (mod) => __copyProps2(__defProp3({}, "__esModule", { value: true }), mod);
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var index_exports = {};
     __export2(index_exports, {
       arrayzeValue: () => arrayzeValue,
@@ -83,7 +83,147 @@ var require_cjs = __commonJS({
     var isString2 = (arg) => typeof arg === "string";
     var isNumber2 = (arg) => typeof arg === "number";
     var isArray2 = (arg) => Array.isArray(arg);
+    var STATE_METHODS3 = [
+      "update",
+      "parse",
+      "clean",
+      "create",
+      "destroy",
+      "add",
+      "toggle",
+      "remove",
+      "apply",
+      "set",
+      "reset",
+      "replace",
+      "quietReplace",
+      "quietUpdate",
+      "applyReplace",
+      "applyFunction",
+      "keys",
+      "values",
+      "ref",
+      "rootUpdate",
+      "parentUpdate",
+      "parent",
+      "__element",
+      "__depends",
+      "__ref",
+      "__children",
+      "root",
+      "setByPath",
+      "setPathCollection",
+      "removeByPath",
+      "removePathCollection",
+      "getByPath"
+    ];
+    var PROPS_METHODS3 = ["update", "__element"];
+    var METHODS3 = [
+      "set",
+      "reset",
+      "update",
+      "remove",
+      "updateContent",
+      "removeContent",
+      "lookup",
+      "lookdown",
+      "lookdownAll",
+      "getRef",
+      "getPath",
+      "setNodeStyles",
+      "spotByPath",
+      "keys",
+      "parse",
+      "setProps",
+      "parseDeep",
+      "variables",
+      "if",
+      "log",
+      "verbose",
+      "warn",
+      "error",
+      "call",
+      "nextElement",
+      "previousElement"
+    ];
+    var METHODS_EXL3 = [
+      ...["node", "context", "extends", "__element", "__ref"],
+      ...METHODS3,
+      ...STATE_METHODS3,
+      ...PROPS_METHODS3
+    ];
     var isMobile2 = (() => typeof navigator === "undefined" ? false : /Mobi/.test(navigator.userAgent))();
+    var STATE_METHODS22 = [
+      "update",
+      "parse",
+      "clean",
+      "create",
+      "destroy",
+      "add",
+      "toggle",
+      "remove",
+      "apply",
+      "set",
+      "reset",
+      "replace",
+      "quietReplace",
+      "quietUpdate",
+      "applyReplace",
+      "applyFunction",
+      "keys",
+      "values",
+      "ref",
+      "rootUpdate",
+      "parentUpdate",
+      "parent",
+      "__element",
+      "__depends",
+      "__ref",
+      "__children",
+      "root",
+      "setByPath",
+      "setPathCollection",
+      "removeByPath",
+      "removePathCollection",
+      "getByPath"
+    ];
+    var PROPS_METHODS22 = ["update", "__element"];
+    var METHODS22 = [
+      "set",
+      "reset",
+      "update",
+      "remove",
+      "updateContent",
+      "removeContent",
+      "lookup",
+      "lookdown",
+      "lookdownAll",
+      "getRef",
+      "getPath",
+      "setNodeStyles",
+      "spotByPath",
+      "keys",
+      "parse",
+      "setProps",
+      "parseDeep",
+      "variables",
+      "if",
+      "log",
+      "verbose",
+      "warn",
+      "error",
+      "call",
+      "nextElement",
+      "previousElement"
+    ];
+    var METHODS_EXL22 = [
+      ...["node", "context", "extends", "__element", "__ref"],
+      ...METHODS22,
+      ...STATE_METHODS22,
+      ...PROPS_METHODS22
+    ];
+    var window32 = globalThis;
+    var document32 = window32.document;
     async function toggleFullscreen(opts) {
       if (!document.fullscreenElement) {
         try {
@@ -264,16 +404,16 @@ __export(var_exports, {
 });
 module.exports = __toCommonJS(var_exports);
 
-// node_modules/@domql/utils/dist/esm/globals.js
+// ../../../domql/packages/utils/globals.js
 var window2 = globalThis;
 var document2 = window2.document;
 
-// node_modules/@domql/utils/dist/esm/node.js
+// ../../../domql/packages/utils/node.js
 var isDOMNode = (obj) => {
   return typeof window2 !== "undefined" && (obj instanceof window2.Node || obj instanceof window2.Window || obj === window2 || obj === document);
 };
 
-// node_modules/@domql/utils/dist/esm/types.js
+// ../../../domql/packages/utils/types.js
 var isFunction = (arg) => typeof arg === "function";
 var isNull = (arg) => arg === null;
 var isArray = (arg) => Array.isArray(arg);
@@ -285,35 +425,92 @@ var isUndefined = (arg) => {
   return arg === void 0;
 };
 
-// node_modules/@domql/utils/dist/esm/array.js
-var mergeArray = (arr, exclude = []) => {
-  return arr.reduce((a, c) => deepMerge(a, deepClone(c, { exclude }), exclude), {});
+// ../../../domql/packages/utils/array.js
+var unstackArrayOfObjects = (arr, exclude = []) => {
+  return arr.reduce(
+    (a, c) => deepMerge(a, deepClone(c, { exclude }), exclude),
+    {}
+  );
 };
 
-// node_modules/@domql/utils/dist/esm/object.js
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var deepMerge = (element, extend, excludeFrom = []) => {
+// ../../../domql/packages/utils/keys.js
+var STATE_METHODS = [
+  "update",
+  "parse",
+  "clean",
+  "create",
+  "destroy",
+  "add",
+  "toggle",
+  "remove",
+  "apply",
+  "set",
+  "reset",
+  "replace",
+  "quietReplace",
+  "quietUpdate",
+  "applyReplace",
+  "applyFunction",
+  "keys",
+  "values",
+  "ref",
+  "rootUpdate",
+  "parentUpdate",
+  "parent",
+  "__element",
+  "__depends",
+  "__ref",
+  "__children",
+  "root",
+  "setByPath",
+  "setPathCollection",
+  "removeByPath",
+  "removePathCollection",
+  "getByPath"
+];
+var PROPS_METHODS = ["update", "__element"];
+var METHODS = [
+  "set",
+  "reset",
+  "update",
+  "remove",
+  "updateContent",
+  "removeContent",
+  "lookup",
+  "lookdown",
+  "lookdownAll",
+  "getRef",
+  "getPath",
+  "setNodeStyles",
+  "spotByPath",
+  "keys",
+  "parse",
+  "setProps",
+  "parseDeep",
+  "variables",
+  "if",
+  "log",
+  "verbose",
+  "warn",
+  "error",
+  "call",
+  "nextElement",
+  "previousElement"
+];
+var METHODS_EXL = [
+  ...["node", "context", "extends", "__element", "__ref"],
+  ...METHODS,
+  ...STATE_METHODS,
+  ...PROPS_METHODS
+];
+
+// ../../../domql/packages/utils/object.js
+var deepMerge = (element, extend, excludeFrom = METHODS_EXL) => {
   for (const e in extend) {
-    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(extend, e);
-    if (!hasOwnProperty2 || excludeFrom.includes(e) || e.startsWith("__")) continue;
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(extend, e);
+    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith("__")) {
+      continue;
+    }
     const elementProp = element[e];
     const extendProp = extend[e];
     if (isObjectLike(elementProp) && isObjectLike(extendProp)) {
@@ -331,7 +528,7 @@ var deepClone = (obj, options = {}) => {
     cleanNull = false,
     window: targetWindow,
     visited = /* @__PURE__ */ new WeakMap(),
-    handleExtend = false
+    handleExtends = false
   } = options;
   if (!isObjectLike(obj) || isDOMNode(obj)) {
     return obj;
@@ -339,39 +536,119 @@ var deepClone = (obj, options = {}) => {
   if (visited.has(obj)) {
     return visited.get(obj);
   }
-  const clone2 = targetWindow ? isArray(obj) ? new targetWindow.Array() : new targetWindow.Object() : isArray(obj) ? [] : {};
-  visited.set(obj, clone2);
+  const clone = targetWindow ? isArray(obj) ? new targetWindow.Array() : new targetWindow.Object() : isArray(obj) ? [] : {};
+  visited.set(obj, clone);
   for (const key in obj) {
     if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
-    if (exclude.includes(key) || key.startsWith("__") || key === "__proto__") continue;
+    if (exclude.includes(key) || key.startsWith("__") || key === "__proto__") {
+      continue;
+    }
     const value = obj[key];
-    if (cleanUndefined && isUndefined(value) || cleanNull && isNull(value)) continue;
+    if (cleanUndefined && isUndefined(value) || cleanNull && isNull(value)) {
+      continue;
+    }
     if (isDOMNode(value)) {
-      clone2[key] = value;
+      clone[key] = value;
       continue;
     }
-    if (handleExtend && key === "extend" && isArray(value)) {
-      clone2[key] = mergeArray(value, exclude);
+    if (handleExtends && key === "extends" && isArray(value)) {
+      clone[key] = unstackArrayOfObjects(value, exclude);
       continue;
     }
     if (isFunction(value) && targetWindow) {
-      clone2[key] = targetWindow.eval("(" + value.toString() + ")");
+      clone[key] = targetWindow.eval("(" + value.toString() + ")");
       continue;
     }
     if (isObjectLike(value)) {
-      clone2[key] = deepClone(value, __spreadProps(__spreadValues({}, options), {
+      clone[key] = deepClone(value, {
+        ...options,
         visited
-      }));
+      });
     } else {
-      clone2[key] = value;
+      clone[key] = value;
     }
   }
-  return clone2;
+  return clone;
 };
 
-// node_modules/@domql/utils/dist/esm/cookie.js
+// ../../../domql/packages/utils/cookie.js
 var isMobile = (() => typeof navigator === "undefined" ? false : /Mobi/.test(navigator.userAgent))();
 
+// ../../../domql/packages/event/dist/esm/keys.js
+var STATE_METHODS2 = [
+  "update",
+  "parse",
+  "clean",
+  "create",
+  "destroy",
+  "add",
+  "toggle",
+  "remove",
+  "apply",
+  "set",
+  "reset",
+  "replace",
+  "quietReplace",
+  "quietUpdate",
+  "applyReplace",
+  "applyFunction",
+  "keys",
+  "values",
+  "ref",
+  "rootUpdate",
+  "parentUpdate",
+  "parent",
+  "__element",
+  "__depends",
+  "__ref",
+  "__children",
+  "root",
+  "setByPath",
+  "setPathCollection",
+  "removeByPath",
+  "removePathCollection",
+  "getByPath"
+];
+var PROPS_METHODS2 = ["update", "__element"];
+var METHODS2 = [
+  "set",
+  "reset",
+  "update",
+  "remove",
+  "updateContent",
+  "removeContent",
+  "lookup",
+  "lookdown",
+  "lookdownAll",
+  "getRef",
+  "getPath",
+  "setNodeStyles",
+  "spotByPath",
+  "keys",
+  "parse",
+  "setProps",
+  "parseDeep",
+  "variables",
+  "if",
+  "log",
+  "verbose",
+  "warn",
+  "error",
+  "call",
+  "nextElement",
+  "previousElement"
+];
+var METHODS_EXL2 = [
+  ...["node", "context", "extends", "__element", "__ref"],
+  ...METHODS2,
+  ...STATE_METHODS2,
+  ...PROPS_METHODS2
+];
+
+// ../../../domql/packages/event/dist/esm/globals.js
+var window3 = globalThis;
+var document3 = window3.document;
+
 // src/defaultConfig/index.js
 var defaultConfig_exports = {};
 __export(defaultConfig_exports, {
@@ -594,7 +871,7 @@ var getActiveConfig = (def) => {
 };
 
 // src/utils/sequence.js
-var import_utils3 = __toESM(require_cjs(), 1);
+var import_utils4 = __toESM(require_cjs(), 1);
 
 // src/utils/unit.js
 var isScalingUnit = (unit) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "files": [
     "src",
     "dist"
@@ -25,10 +25,9 @@
     "prepublish": "rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/globals": "latest",
-    "@domql/utils": "^2.5.0",
-    "@symbo.ls/utils": "^3.0.1",
+    "@domql/utils": "^3.1.1",
+    "@symbo.ls/utils": "^3.1.1",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "a4e7f586f7e4f60bd7b6a8388bdacc3ae1879433"
+  "gitHead": "39fb7a8c07355468ccce79e2f787ca3fa0715692"
 }

package/src/set.js

@@ -78,7 +78,14 @@ export const setEach = (factoryName, props) => {
   const CONFIG = getActiveConfig()
   const FACTORY_NAME = factoryName.toUpperCase()
   const keys = Object.keys(props)
-  keys.map(key => setValue(FACTORY_NAME, props[key], key))
+
+  keys.forEach((key) => {
+    try {
+      return setValue(FACTORY_NAME, props[key], key)
+    } catch (error) {
+      if (CONFIG.verbose) console.warn('Error setting', FACTORY_NAME, 'value', props[key], key, error)
+    }
+  })
 
   return CONFIG[FACTORY_NAME]
 }
@@ -125,9 +132,21 @@ export const set = (recivedConfig, options = SET_OPTIONS) => {
   keys.map(key => setEach(key, config[key]))
 
   // apply generic configs
-  if (config.TYPOGRAPHY) applyTypographySequence()
-  if (config.SPACING) applySpacingSequence()
-  if (config.TIMING) applyTimingSequence()
+  if (config.TYPOGRAPHY) {
+    try { applyTypographySequence() } catch (e) {
+      if (CONFIG.verbose) console.warn('Error applying typography sequence', e)
+    }
+  }
+  if (config.SPACING) {
+    try { applySpacingSequence() } catch (e) {
+      if (CONFIG.verbose) console.warn('Error applying typography sequence', e)
+    }
+  }
+  if (config.TIMING) {
+    try { applyTimingSequence() } catch (e) {
+      if (CONFIG.verbose) console.warn('Error applying typography sequence', e)
+    }
+  }
   applyDocument()
   applyReset()
 

package/src/system/typography.js

@@ -76,8 +76,9 @@ export const applyHeadings = (props) => {
     for (const k in HEADINGS) {
       const headerName = `h${parseInt(k) + 1}`
       const headerStyle = templates[headerName]
+      if (!HEADINGS[k]) continue
       templates[headerName] = {
-        fontSize: CONFIG.useVariable ? `var(${HEADINGS[k].variable})` : `${HEADINGS[k].scaling}${unit}`,
+        fontSize: CONFIG.useVariable ? `var(${HEADINGS[k]?.variable})` : `${HEADINGS[k].scaling}${unit}`,
         margin: headerStyle ? headerStyle.margin : 0,
         lineHeight: headerStyle ? headerStyle.lineHeight : props.lineHeight,
         letterSpacing: headerStyle ? headerStyle.letterSpacing : props.letterSpacing,

package/src/utils/color.js

@@ -151,7 +151,7 @@ export const mixTwoRgba = (colorA, colorB, range = 0.5) => {
 export const opacify = (color, opacity) => {
   const arr = colorStringToRgbaArray(color)
   if (!arr) {
-    if (ENV === 'test' || ENV === 'development') console.warn(color + ' color is not rgba')
+    if (ENV === 'testing' || ENV === 'development') console.warn(color + ' color is not rgba')
     return
   }
   arr[3] = opacity

package/src/utils/sequence.js

@@ -170,8 +170,13 @@ export const generateSequence = (sequenceProps) => {
 
 export const generateSequencePosition = (sequenceProps, position = 0) => {
   const { type, base, ratio, subSequence } = sequenceProps
-  const letterKey = this.call("isString", position) ? position : numToLetterMap[position]
-
+  const letterKey = isString(position) ? position : numToLetterMap[position]
+  const index = isString(position)
+    ? Object.entries(numToLetterMap).find(
+        ([, value]) => value === position
+      )?.[0]
+    : position
+  
   if (!letterKey) {
     console.warn(`Position ${position} is out of range in numToLetterMap`)
     return null
@@ -184,11 +189,11 @@ export const generateSequencePosition = (sequenceProps, position = 0) => {
     ...sequenceProps
   }
 
-  const value = base * Math.pow(ratio, position)
+  const value = base * Math.pow(ratio, index)
   const scaling = ~~((value / base) * 100) / 100
   const prefix = '--' + (type && type.replace('.', '-')) + '-'
   const variable = prefix + letterKey
-  const scalingVariable = setScalingVar(position, sequenceProps)
+  const scalingVariable = setScalingVar(index, sequenceProps)
 
   const props = {
     key: letterKey,
@@ -198,7 +203,7 @@ export const generateSequencePosition = (sequenceProps, position = 0) => {
     scaling,
     scalingVariable,
     ratio,
-    index: position
+    index
   }
 
   setSequenceValue(props, result)

package/src/utils/sprite.js

@@ -3,6 +3,9 @@
 import { isArray, isString } from '@domql/utils'
 import { getActiveConfig } from '../factory'
 
+const ENV = process.env.NODE_ENV || 'development'
+const isDev = ENV === 'development' || ENV === 'testing'
+
 export const generateSprite = (icons) => {
   const CONFIG = getActiveConfig()
 
@@ -20,7 +23,8 @@ export const generateSprite = (icons) => {
 const parseRootAttributes = (htmlString) => {
   const val = htmlString.default || htmlString
   if (!isString(val)) {
-    return console.warn(`parseRootAttributes: ${val} is not a string`)
+    if (isDev) console.warn('parseRootAttributes:', val, 'is not a string')
+    return
   }
 
   const match = val.match(/<svg\s+(.*?)>/)