@symbo.ls/scratch 2.11.21 → 2.11.28

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);
 
-// ../../../refactor/domql/packages/key/dist/cjs/index.js
+// ../../node_modules/@domql/key/dist/cjs/index.js
 var require_cjs = __commonJS({
-  "../../../refactor/domql/packages/key/dist/cjs/index.js"(exports, module2) {
+  "../../node_modules/@domql/key/dist/cjs/index.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -69,9 +69,9 @@ var require_cjs = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/tags/dist/cjs/htmlTags.js
+// ../../node_modules/@domql/tags/dist/cjs/htmlTags.js
 var require_htmlTags = __commonJS({
-  "../../../refactor/domql/packages/tags/dist/cjs/htmlTags.js"(exports, module2) {
+  "../../node_modules/@domql/tags/dist/cjs/htmlTags.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -232,9 +232,9 @@ var require_htmlTags = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/tags/dist/cjs/index.js
+// ../../node_modules/@domql/tags/dist/cjs/index.js
 var require_cjs2 = __commonJS({
-  "../../../refactor/domql/packages/tags/dist/cjs/index.js"(exports, module2) {
+  "../../node_modules/@domql/tags/dist/cjs/index.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -256,9 +256,9 @@ var require_cjs2 = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/globals/dist/cjs/index.js
+// ../../node_modules/@domql/globals/dist/cjs/index.js
 var require_cjs3 = __commonJS({
-  "../../../refactor/domql/packages/globals/dist/cjs/index.js"(exports, module2) {
+  "../../node_modules/@domql/globals/dist/cjs/index.js"(exports, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -292,9 +292,9 @@ var require_cjs3 = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/utils/dist/cjs/node.js
+// ../../node_modules/@domql/utils/dist/cjs/node.js
 var require_node = __commonJS({
-  "../../../refactor/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;
@@ -329,9 +329,9 @@ var require_node = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/utils/dist/cjs/types.js
+// ../../node_modules/@domql/utils/dist/cjs/types.js
 var require_types = __commonJS({
-  "../../../refactor/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;
@@ -419,75 +419,9 @@ var require_types = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/utils/dist/cjs/array.js
-var require_array = __commonJS({
-  "../../../refactor/domql/packages/utils/dist/cjs/array.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export2 = (target, all) => {
-      for (var name in all)
-        __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 (!__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(__defProp2({}, "__esModule", { value: true }), mod);
-    var array_exports = {};
-    __export2(array_exports, {
-      arrayContainsOtherArray: () => arrayContainsOtherArray,
-      joinArrays: () => joinArrays,
-      mergeAndCloneIfArray: () => mergeAndCloneIfArray,
-      mergeArray: () => mergeArray,
-      removeFromArray: () => removeFromArray,
-      swapItemsInArray: () => swapItemsInArray
-    });
-    module2.exports = __toCommonJS2(array_exports);
-    var import_object = require_object();
-    var import_types = require_types();
-    var arrayContainsOtherArray = (arr1, arr2) => {
-      return arr2.every((val) => arr1.includes(val));
-    };
-    var removeFromArray = (arr, index) => {
-      if ((0, import_types.isString)(index))
-        index = parseInt(index);
-      if ((0, import_types.isNumber)(index)) {
-        if (index < 0 || index >= arr.length || isNaN(index)) {
-          throw new Error("Invalid index");
-        }
-        arr.splice(index, 1);
-      } else if ((0, import_types.isArray)(index)) {
-        index.forEach((idx) => removeFromArray(arr, idx));
-      } else {
-        throw new Error("Invalid index");
-      }
-      return arr;
-    };
-    var swapItemsInArray = (arr, i, j) => {
-      [arr[i], arr[j]] = [arr[j], arr[i]];
-    };
-    var joinArrays = (...arrays) => {
-      return [].concat(...arrays);
-    };
-    var mergeArray = (arr, excludeFrom = []) => {
-      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, excludeFrom), excludeFrom), {});
-    };
-    var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
-    };
-  }
-});
-
-// ../../../refactor/domql/packages/utils/dist/cjs/object.js
+// ../../node_modules/@domql/utils/dist/cjs/object.js
 var require_object = __commonJS({
-  "../../../refactor/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;
@@ -523,17 +457,16 @@ var require_object = __commonJS({
       isEqualDeep: () => isEqualDeep,
       map: () => map,
       merge: () => merge,
-      mergeArrayExclude: () => mergeArrayExclude,
       mergeIfExisted: () => mergeIfExisted,
       overwrite: () => overwrite,
       overwriteDeep: () => overwriteDeep,
+      overwriteObj: () => overwriteObj,
       overwriteShallow: () => overwriteShallow,
       removeFromObject: () => removeFromObject
     });
     module2.exports = __toCommonJS2(object_exports);
     var import_globals = require_cjs3();
     var import_types = require_types();
-    var import_array = require_array();
     var exec = (param, element, state, context) => {
       if ((0, import_types.isFunction)(param)) {
         return param(
@@ -545,32 +478,30 @@ var require_object = __commonJS({
       return param;
     };
     var map = (obj, extention, element) => {
-      for (const e in extention) {
-        obj[e] = exec(extention[e], element);
+      for (const e2 in extention) {
+        obj[e2] = exec(extention[e2], element);
       }
     };
-    var merge = (element, obj, excludeFrom = []) => {
-      for (const e in obj) {
-        if (excludeFrom.includes(e) || e.includes("__"))
-          continue;
-        const elementProp = element[e];
-        const objProp = obj[e];
+    var merge = (element, obj) => {
+      for (const e2 in obj) {
+        const elementProp = element[e2];
+        const objProp = obj[e2];
         if (elementProp === void 0) {
-          element[e] = objProp;
+          element[e2] = objProp;
         }
       }
       return element;
     };
     var deepMerge2 = (element, extend, excludeFrom = []) => {
-      for (const e in extend) {
-        if (excludeFrom.includes(e) || e.includes("__"))
+      for (const e2 in extend) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
-        const elementProp = element[e];
-        const extendProp = extend[e];
+        const elementProp = element[e2];
+        const extendProp = extend[e2];
         if ((0, import_types.isObjectLike)(elementProp) && (0, import_types.isObjectLike)(extendProp)) {
           deepMerge2(elementProp, extendProp);
         } else if (elementProp === void 0) {
-          element[e] = extendProp;
+          element[e2] = extendProp;
         }
       }
       return element;
@@ -578,7 +509,7 @@ var require_object = __commonJS({
     var clone = (obj, excludeFrom = []) => {
       const o = {};
       for (const prop in obj) {
-        if (excludeFrom.includes(prop) || prop.includes("__"))
+        if (excludeFrom.includes(e) || e.includes("__"))
           continue;
         o[prop] = obj[prop];
       }
@@ -605,9 +536,6 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var mergeArrayExclude = (arr, excl = []) => {
-      return arr.reduce((acc, curr) => deepMerge2(acc, deepCloneExclude(curr, excl)), {});
-    };
     var deepClone2 = (obj, excludeFrom = []) => {
       const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
@@ -615,7 +543,7 @@ var require_object = __commonJS({
           continue;
         let objProp = obj[prop];
         if (prop === "extend" && (0, import_types.isArray)(objProp)) {
-          objProp = (0, import_array.mergeArray)(objProp);
+          objProp = mergeArray(objProp);
         }
         if ((0, import_types.isObjectLike)(objProp)) {
           o[prop] = deepClone2(objProp, excludeFrom);
@@ -684,8 +612,8 @@ var require_object = __commonJS({
             try {
               const evalProp = import_globals.window.eval(`(${objProp})`);
               stringified[prop] = evalProp;
-            } catch (e) {
-              if (e)
+            } catch (e2) {
+              if (e2)
                 stringified[prop] = objProp;
             }
           } else {
@@ -699,8 +627,8 @@ var require_object = __commonJS({
                 try {
                   const evalProp = import_globals.window.eval(`(${arrProp})`);
                   stringified[prop].push(evalProp);
-                } catch (e) {
-                  if (e)
+                } catch (e2) {
+                  if (e2)
                     stringified[prop].push(arrProp);
                 }
               } else {
@@ -720,17 +648,32 @@ var require_object = __commonJS({
       }
       return stringified;
     };
+    var overwrite = (element, params, excludeFrom = []) => {
+      const { ref } = element;
+      const changes = {};
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
+          continue;
+        const elementProp = element[e2];
+        const paramsProp = params[e2];
+        if (paramsProp) {
+          ref.__cache[e2] = changes[e2] = elementProp;
+          ref[e2] = paramsProp;
+        }
+      }
+      return changes;
+    };
     var diffObjects = (original, objToDiff, cache) => {
-      for (const e in objToDiff) {
-        if (e === "ref")
+      for (const e2 in objToDiff) {
+        if (e2 === "ref")
           continue;
-        const originalProp = original[e];
-        const objToDiffProp = objToDiff[e];
+        const originalProp = original[e2];
+        const objToDiffProp = objToDiff[e2];
         if ((0, import_types.isObject)(originalProp) && (0, import_types.isObject)(objToDiffProp)) {
-          cache[e] = {};
-          diff(originalProp, objToDiffProp, cache[e]);
+          cache[e2] = {};
+          diff(originalProp, objToDiffProp, cache[e2]);
         } else if (objToDiffProp !== void 0) {
-          cache[e] = objToDiffProp;
+          cache[e2] = objToDiffProp;
         }
       }
       return cache;
@@ -761,39 +704,35 @@ var require_object = __commonJS({
       }
       return cache;
     };
-    var overwrite = (element, params, excludeFrom = []) => {
-      const { ref } = element;
+    var overwriteObj = (params, obj) => {
       const changes = {};
-      for (const e in params) {
-        if (excludeFrom.includes(e) || e.includes("__"))
-          continue;
-        const elementProp = element[e];
-        const paramsProp = params[e];
+      for (const e2 in params) {
+        const objProp = obj[e2];
+        const paramsProp = params[e2];
         if (paramsProp) {
-          ref.__cache[e] = changes[e] = elementProp;
-          ref[e] = paramsProp;
+          obj[e2] = changes[e2] = objProp;
         }
       }
       return changes;
     };
     var overwriteShallow = (obj, params, excludeFrom = []) => {
-      for (const e in params) {
-        if (excludeFrom.includes(e) || e.includes("__"))
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
-        obj[e] = params[e];
+        obj[e2] = params[e2];
       }
       return obj;
     };
-    var overwriteDeep = (obj, params, excludeFrom = []) => {
-      for (const e in params) {
-        if (excludeFrom.includes(e) || e.includes("__"))
+    var overwriteDeep = (params, obj, excludeFrom = []) => {
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
-        const objProp = obj[e];
-        const paramsProp = params[e];
+        const objProp = obj[e2];
+        const paramsProp = params[e2];
         if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-          overwriteDeep(objProp, paramsProp);
+          overwriteDeep(paramsProp, objProp);
         } else if (paramsProp !== void 0) {
-          obj[e] = paramsProp;
+          obj[e2] = paramsProp;
         }
       }
       return obj;
@@ -804,7 +743,7 @@ var require_object = __commonJS({
       return a || b;
     };
     var flattenRecursive = (param, prop, stack = []) => {
-      const objectized = (0, import_array.mergeAndCloneIfArray)(param);
+      const objectized = mergeAndCloneIfArray(param);
       stack.push(objectized);
       const extendOfExtend = objectized[prop];
       if (extendOfExtend)
@@ -847,9 +786,9 @@ var require_object = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/utils/dist/cjs/function.js
+// ../../node_modules/@domql/utils/dist/cjs/function.js
 var require_function = __commonJS({
-  "../../../refactor/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;
@@ -899,9 +838,75 @@ var require_function = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/utils/dist/cjs/log.js
+// ../../node_modules/@domql/utils/dist/cjs/array.js
+var require_array = __commonJS({
+  "../../node_modules/@domql/utils/dist/cjs/array.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __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 (!__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(__defProp2({}, "__esModule", { value: true }), mod);
+    var array_exports = {};
+    __export2(array_exports, {
+      arrayContainsOtherArray: () => arrayContainsOtherArray,
+      joinArrays: () => joinArrays,
+      mergeAndCloneIfArray: () => mergeAndCloneIfArray2,
+      mergeArray: () => mergeArray2,
+      removeFromArray: () => removeFromArray,
+      swapItemsInArray: () => swapItemsInArray
+    });
+    module2.exports = __toCommonJS2(array_exports);
+    var import_object = require_object();
+    var import_types = require_types();
+    var arrayContainsOtherArray = (arr1, arr2) => {
+      return arr2.every((val) => arr1.includes(val));
+    };
+    var removeFromArray = (arr, index) => {
+      if ((0, import_types.isString)(index))
+        index = parseInt(index);
+      if ((0, import_types.isNumber)(index)) {
+        if (index < 0 || index >= arr.length || isNaN(index)) {
+          throw new Error("Invalid index");
+        }
+        arr.splice(index, 1);
+      } else if ((0, import_types.isArray)(index)) {
+        index.forEach((idx) => removeFromArray(arr, idx));
+      } else {
+        throw new Error("Invalid index");
+      }
+      return arr;
+    };
+    var swapItemsInArray = (arr, i, j) => {
+      [arr[i], arr[j]] = [arr[j], arr[i]];
+    };
+    var joinArrays = (...arrays) => {
+      return [].concat(...arrays);
+    };
+    var mergeArray2 = (arr, excludeFrom = []) => {
+      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, excludeFrom), excludeFrom), {});
+    };
+    var mergeAndCloneIfArray2 = (obj) => {
+      return (0, import_types.isArray)(obj) ? mergeArray2(obj) : (0, import_object.deepClone)(obj);
+    };
+  }
+});
+
+// ../../node_modules/@domql/utils/dist/cjs/log.js
 var require_log = __commonJS({
-  "../../../refactor/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;
@@ -940,9 +945,9 @@ var require_log = __commonJS({
   }
 });
 
-// ../../../refactor/domql/packages/utils/dist/cjs/index.js
+// ../../node_modules/@domql/utils/dist/cjs/index.js
 var require_cjs4 = __commonJS({
-  "../../../refactor/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/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.21",
+  "version": "2.11.28",
   "files": [
     "src",
     "dist"
@@ -32,5 +32,5 @@
   "peerDependencies": {
     "@emotion/css": "^11.5.0"
   },
-  "gitHead": "56cbd0c8ecdf0ec6427bcbfa7f853dbd04020b9d"
+  "gitHead": "013c9c3462fc6d6d2cdb158fc6857426a4a9ab5e"
 }

package/src/system/svg.js

@@ -78,7 +78,7 @@ const appendSVG = (lib, options = DEF_OPTIONS) => {
     exists.append(...tempSVG.children)
   } else {
     const svgSpriteDOM = createSVGSpriteElement()
-    if (svgSpriteDOM && svgSpriteDOM.innerHTML) {
+    if (svgSpriteDOM && svgSpriteDOM.nodeType) {
       svgSpriteDOM.innerHTML = SVGsprite
       doc.body.prepend(svgSpriteDOM)
     }