@symbo.ls/scratch 2.11.5 → 2.11.17

package/dist/cjs/utils/sprite.js

@@ -354,7 +354,7 @@ var require_types = __commonJS({
     __export2(types_exports, {
       TYPES: () => TYPES,
       is: () => is,
-      isArray: () => isArray,
+      isArray: () => isArray2,
       isBoolean: () => isBoolean,
       isDefined: () => isDefined2,
       isFunction: () => isFunction,
@@ -381,21 +381,21 @@ var require_types = __commonJS({
     var isFunction = (arg) => typeof arg === "function";
     var isBoolean = (arg) => arg === true || arg === false;
     var isNull = (arg) => arg === null;
-    var isArray = (arg) => Array.isArray(arg);
+    var isArray2 = (arg) => Array.isArray(arg);
     var isObjectLike = (arg) => {
       if (arg === null)
         return false;
       return typeof arg === "object";
     };
     var isDefined2 = (arg) => {
-      return isObject2(arg) || isObjectLike(arg) || isString2(arg) || isNumber(arg) || isFunction(arg) || isArray(arg) || isObjectLike(arg) || isBoolean(arg) || isNull(arg);
+      return isObject2(arg) || isObjectLike(arg) || isString2(arg) || isNumber(arg) || isFunction(arg) || isArray2(arg) || isObjectLike(arg) || isBoolean(arg) || isNull(arg);
     };
     var isUndefined = (arg) => {
       return arg === void 0;
     };
     var TYPES = {
       boolean: isBoolean,
-      array: isArray,
+      array: isArray2,
       object: isObject2,
       string: isString2,
       number: isNumber,
@@ -457,13 +457,11 @@ var require_object = __commonJS({
       isEqualDeep: () => isEqualDeep,
       map: () => map,
       merge: () => merge,
-      mergeAndCloneIfArray: () => mergeAndCloneIfArray,
-      mergeArray: () => mergeArray,
-      mergeArrayExclude: () => mergeArrayExclude,
       mergeIfExisted: () => mergeIfExisted,
       overwrite: () => overwrite,
       overwriteDeep: () => overwriteDeep,
       overwriteObj: () => overwriteObj,
+      overwriteShallow: () => overwriteShallow,
       removeFromObject: () => removeFromObject
     });
     module2.exports = __toCommonJS2(object_exports);
@@ -480,81 +478,75 @@ 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) => {
-      for (const e in obj) {
-        const elementProp = element[e];
-        const objProp = obj[e];
+      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) => {
-      for (const e in extend) {
-        const elementProp = element[e];
-        const extendProp = extend[e];
-        if (e === "parent" || e === "props")
+    var deepMerge2 = (element, extend, excludeFrom = []) => {
+      for (const e2 in extend) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
+        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;
     };
-    var clone = (obj) => {
+    var clone = (obj, excludeFrom = []) => {
       const o = {};
       for (const prop in obj) {
-        if (prop === "node")
+        if (excludeFrom.includes(e) || e.includes("__"))
           continue;
         o[prop] = obj[prop];
       }
       return o;
     };
-    var deepCloneExclude = (obj, exclude = []) => {
+    var deepCloneExclude = (obj, excludeFrom = []) => {
       if ((0, import_types.isArray)(obj)) {
-        return obj.map((x) => deepCloneExclude(x, exclude));
+        return obj.map((x) => deepCloneExclude(x, excludeFrom));
       }
       const o = {};
       for (const k in obj) {
-        if (exclude.indexOf(k) > -1)
+        if (excludeFrom.includes(k) || k.includes("__"))
           continue;
         let v = obj[k];
         if (k === "extend" && (0, import_types.isArray)(v)) {
-          v = mergeArrayExclude(v, exclude);
+          v = mergeArrayExclude(v, excludeFrom);
         }
         if ((0, import_types.isArray)(v)) {
-          o[k] = v.map((x) => deepCloneExclude(x, exclude));
+          o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
         } else if ((0, import_types.isObject)(v)) {
-          o[k] = deepCloneExclude(v, exclude);
+          o[k] = deepCloneExclude(v, excludeFrom);
         } else
           o[k] = v;
       }
       return o;
     };
-    var mergeArrayExclude = (arr, excl = []) => {
-      return arr.reduce((acc, curr) => deepMerge2(acc, deepCloneExclude(curr, excl)), {});
-    };
-    var deepClone2 = (obj) => {
-      if ((0, import_types.isArray)(obj)) {
-        return obj.map(deepClone2);
-      }
-      const o = {};
+    var deepClone2 = (obj, excludeFrom = []) => {
+      const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
+        if (excludeFrom.includes(prop) || prop.includes("__"))
+          continue;
         let objProp = obj[prop];
         if (prop === "extend" && (0, import_types.isArray)(objProp)) {
           objProp = mergeArray(objProp);
         }
-        if ((0, import_types.isArray)(objProp)) {
-          o[prop] = objProp.map((v) => (0, import_types.isObject)(v) ? deepClone2(v) : v);
-        } else if ((0, import_types.isObject)(objProp)) {
-          o[prop] = deepClone2(objProp);
+        if ((0, import_types.isObjectLike)(objProp)) {
+          o[prop] = deepClone2(objProp, excludeFrom);
         } else
           o[prop] = objProp;
       }
@@ -620,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 {
@@ -635,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 {
@@ -656,32 +648,32 @@ var require_object = __commonJS({
       }
       return stringified;
     };
-    var overwrite = (element, params, options) => {
+    var overwrite = (element, params, excludeFrom = []) => {
       const { ref } = element;
       const changes = {};
-      for (const e in params) {
-        if (e === "props")
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
-        const elementProp = element[e];
-        const paramsProp = params[e];
+        const elementProp = element[e2];
+        const paramsProp = params[e2];
         if (paramsProp) {
-          ref.__cache[e] = changes[e] = elementProp;
-          ref[e] = 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;
@@ -714,23 +706,33 @@ var require_object = __commonJS({
     };
     var overwriteObj = (params, obj) => {
       const changes = {};
-      for (const e in params) {
-        const objProp = obj[e];
-        const paramsProp = params[e];
+      for (const e2 in params) {
+        const objProp = obj[e2];
+        const paramsProp = params[e2];
         if (paramsProp) {
-          obj[e] = changes[e] = objProp;
+          obj[e2] = changes[e2] = objProp;
         }
       }
       return changes;
     };
-    var overwriteDeep = (params, obj) => {
-      for (const e in params) {
-        const objProp = obj[e];
-        const paramsProp = params[e];
+    var overwriteShallow = (obj, params, excludeFrom = []) => {
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
+          continue;
+        obj[e2] = params[e2];
+      }
+      return obj;
+    };
+    var overwriteDeep = (params, obj, excludeFrom = []) => {
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
+          continue;
+        const objProp = obj[e2];
+        const paramsProp = params[e2];
         if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
           overwriteDeep(paramsProp, objProp);
         } else if (paramsProp !== void 0) {
-          obj[e] = paramsProp;
+          obj[e2] = paramsProp;
         }
       }
       return obj;
@@ -740,12 +742,6 @@ var require_object = __commonJS({
         return deepMerge2(a, b);
       return a || b;
     };
-    var mergeArray = (arr) => {
-      return arr.reduce((a, c) => deepMerge2(a, deepClone2(c)), {});
-    };
-    var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : deepClone2(obj);
-    };
     var flattenRecursive = (param, prop, stack = []) => {
       const objectized = mergeAndCloneIfArray(param);
       stack.push(objectized);
@@ -867,10 +863,13 @@ var require_array = __commonJS({
     __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));
@@ -896,6 +895,12 @@ var require_array = __commonJS({
     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);
+    };
   }
 });
 
@@ -1226,12 +1231,27 @@ var parseRootAttributes = (htmlString) => {
     return acc;
   }, {});
 };
+var replaceIdsAndUrls = (code, key) => {
+  const idRegex = /id="([^"]*)"/;
+  const urlRegex = /url\(#([^)]*)\)/g;
+  const matches = code.match(/id="([^"]*)"/g);
+  let replacedCode = code;
+  if ((0, import_utils2.isArray)(matches)) {
+    matches.forEach(() => {
+      const randomKey = Math.floor(Math.random() * 1e5);
+      replacedCode = code.replace(idRegex, `id="${key}-${randomKey}"`).replace(urlRegex, `url(#${key}-${randomKey})`);
+    });
+  }
+  return replacedCode;
+};
 var convertSvgToSymbol = (key, code) => {
   const extractAttrs = parseRootAttributes(code);
   const { width, height } = extractAttrs;
+  console.log(extractAttrs);
   const viewBox = extractAttrs.viewBox || `0 0 ${width || 24} ${height || 24}`;
   const xmlns = "http://www.w3.org/2000/svg";
-  let symbol = code.replace(
+  const replacedCode = replaceIdsAndUrls(code, key);
+  let symbol = replacedCode.replace(
     "<svg",
     `<symbol id="${key}" xmlns="${xmlns}" viewBox="${viewBox}"`
   );

package/dist/cjs/utils/var.js

@@ -457,13 +457,11 @@ var require_object = __commonJS({
       isEqualDeep: () => isEqualDeep,
       map: () => map,
       merge: () => merge,
-      mergeAndCloneIfArray: () => mergeAndCloneIfArray,
-      mergeArray: () => mergeArray,
-      mergeArrayExclude: () => mergeArrayExclude,
       mergeIfExisted: () => mergeIfExisted,
       overwrite: () => overwrite,
       overwriteDeep: () => overwriteDeep,
       overwriteObj: () => overwriteObj,
+      overwriteShallow: () => overwriteShallow,
       removeFromObject: () => removeFromObject
     });
     module2.exports = __toCommonJS2(object_exports);
@@ -480,81 +478,75 @@ 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) => {
-      for (const e in obj) {
-        const elementProp = element[e];
-        const objProp = obj[e];
+      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) => {
-      for (const e in extend) {
-        const elementProp = element[e];
-        const extendProp = extend[e];
-        if (e === "parent" || e === "props")
+    var deepMerge2 = (element, extend, excludeFrom = []) => {
+      for (const e2 in extend) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
+        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;
     };
-    var clone = (obj) => {
+    var clone = (obj, excludeFrom = []) => {
       const o = {};
       for (const prop in obj) {
-        if (prop === "node")
+        if (excludeFrom.includes(e) || e.includes("__"))
           continue;
         o[prop] = obj[prop];
       }
       return o;
     };
-    var deepCloneExclude = (obj, exclude = []) => {
+    var deepCloneExclude = (obj, excludeFrom = []) => {
       if ((0, import_types.isArray)(obj)) {
-        return obj.map((x) => deepCloneExclude(x, exclude));
+        return obj.map((x) => deepCloneExclude(x, excludeFrom));
       }
       const o = {};
       for (const k in obj) {
-        if (exclude.indexOf(k) > -1)
+        if (excludeFrom.includes(k) || k.includes("__"))
           continue;
         let v = obj[k];
         if (k === "extend" && (0, import_types.isArray)(v)) {
-          v = mergeArrayExclude(v, exclude);
+          v = mergeArrayExclude(v, excludeFrom);
         }
         if ((0, import_types.isArray)(v)) {
-          o[k] = v.map((x) => deepCloneExclude(x, exclude));
+          o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
         } else if ((0, import_types.isObject)(v)) {
-          o[k] = deepCloneExclude(v, exclude);
+          o[k] = deepCloneExclude(v, excludeFrom);
         } else
           o[k] = v;
       }
       return o;
     };
-    var mergeArrayExclude = (arr, excl = []) => {
-      return arr.reduce((acc, curr) => deepMerge2(acc, deepCloneExclude(curr, excl)), {});
-    };
-    var deepClone2 = (obj) => {
-      if ((0, import_types.isArray)(obj)) {
-        return obj.map(deepClone2);
-      }
-      const o = {};
+    var deepClone2 = (obj, excludeFrom = []) => {
+      const o = (0, import_types.isArray)(obj) ? [] : {};
       for (const prop in obj) {
+        if (excludeFrom.includes(prop) || prop.includes("__"))
+          continue;
         let objProp = obj[prop];
         if (prop === "extend" && (0, import_types.isArray)(objProp)) {
           objProp = mergeArray(objProp);
         }
-        if ((0, import_types.isArray)(objProp)) {
-          o[prop] = objProp.map((v) => (0, import_types.isObject)(v) ? deepClone2(v) : v);
-        } else if ((0, import_types.isObject)(objProp)) {
-          o[prop] = deepClone2(objProp);
+        if ((0, import_types.isObjectLike)(objProp)) {
+          o[prop] = deepClone2(objProp, excludeFrom);
         } else
           o[prop] = objProp;
       }
@@ -620,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 {
@@ -635,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 {
@@ -656,32 +648,32 @@ var require_object = __commonJS({
       }
       return stringified;
     };
-    var overwrite = (element, params, options) => {
+    var overwrite = (element, params, excludeFrom = []) => {
       const { ref } = element;
       const changes = {};
-      for (const e in params) {
-        if (e === "props")
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
           continue;
-        const elementProp = element[e];
-        const paramsProp = params[e];
+        const elementProp = element[e2];
+        const paramsProp = params[e2];
         if (paramsProp) {
-          ref.__cache[e] = changes[e] = elementProp;
-          ref[e] = 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;
@@ -714,23 +706,33 @@ var require_object = __commonJS({
     };
     var overwriteObj = (params, obj) => {
       const changes = {};
-      for (const e in params) {
-        const objProp = obj[e];
-        const paramsProp = params[e];
+      for (const e2 in params) {
+        const objProp = obj[e2];
+        const paramsProp = params[e2];
         if (paramsProp) {
-          obj[e] = changes[e] = objProp;
+          obj[e2] = changes[e2] = objProp;
         }
       }
       return changes;
     };
-    var overwriteDeep = (params, obj) => {
-      for (const e in params) {
-        const objProp = obj[e];
-        const paramsProp = params[e];
+    var overwriteShallow = (obj, params, excludeFrom = []) => {
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
+          continue;
+        obj[e2] = params[e2];
+      }
+      return obj;
+    };
+    var overwriteDeep = (params, obj, excludeFrom = []) => {
+      for (const e2 in params) {
+        if (excludeFrom.includes(e2) || e2.includes("__"))
+          continue;
+        const objProp = obj[e2];
+        const paramsProp = params[e2];
         if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
           overwriteDeep(paramsProp, objProp);
         } else if (paramsProp !== void 0) {
-          obj[e] = paramsProp;
+          obj[e2] = paramsProp;
         }
       }
       return obj;
@@ -740,12 +742,6 @@ var require_object = __commonJS({
         return deepMerge2(a, b);
       return a || b;
     };
-    var mergeArray = (arr) => {
-      return arr.reduce((a, c) => deepMerge2(a, deepClone2(c)), {});
-    };
-    var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : deepClone2(obj);
-    };
     var flattenRecursive = (param, prop, stack = []) => {
       const objectized = mergeAndCloneIfArray(param);
       stack.push(objectized);
@@ -867,10 +863,13 @@ var require_array = __commonJS({
     __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));
@@ -896,6 +895,12 @@ var require_array = __commonJS({
     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);
+    };
   }
 });
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.5",
+  "version": "2.11.17",
   "files": [
     "src",
     "dist"
@@ -32,5 +32,5 @@
   "peerDependencies": {
     "@emotion/css": "^11.5.0"
   },
-  "gitHead": "d5256e4c77123737a42641919ddbddb5acb6615c"
+  "gitHead": "df0a3ecf734ae06ee8877d1f58fb7de26cbccd66"
 }