@symbo.ls/scratch 2.11.469 → 2.11.475

package/dist/cjs/utils/sprite.js

@@ -346,11 +346,11 @@ var require_array = __commonJS({
     var joinArrays = (...arrays) => {
       return [].concat(...arrays);
     };
-    var mergeArray = (arr, excludeFrom = []) => {
-      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepCloneWithExtend)(c, excludeFrom), excludeFrom), {});
+    var mergeArray = (arr, exclude = []) => {
+      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, { exclude }), exclude), {});
     };
     var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepCloneWithExtend)(obj);
+      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
     };
     var cutArrayBeforeValue = (arr, value) => {
       const index = arr.indexOf(value);
@@ -599,8 +599,6 @@ var require_object = __commonJS({
       createNestedObject: () => createNestedObject,
       createObjectWithoutPrototype: () => createObjectWithoutPrototype,
       deepClone: () => deepClone2,
-      deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -694,78 +692,56 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneExclude = (obj, excludeFrom = []) => {
-      if ((0, import_types.isArray)(obj)) {
-        return obj.map((x) => deepCloneExclude(x, excludeFrom));
-      }
-      const o = {};
-      for (const k in obj) {
-        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, k);
-        if (!hasOwnProperty2 || excludeFrom.includes(k) || k.startsWith("__"))
-          continue;
-        let v = obj[k];
-        if (k === "extend" && (0, import_types.isArray)(v)) {
-          v = mergeArrayExclude(v, excludeFrom);
-        }
-        if ((0, import_types.isArray)(v)) {
-          o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
-        } else if ((0, import_types.isObject)(v)) {
-          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 mergeArrayExclude = (arr, exclude = []) => {
+      return arr.reduce((acc, curr) => deepMerge2(acc, deepClone2(curr, { exclude })), {});
     };
-    var deepClone2 = (obj, exclude = [], cleanUndefined = false, visited = /* @__PURE__ */ new WeakMap()) => {
-      if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj))
+    var deepClone2 = (obj, options = {}) => {
+      const {
+        exclude = [],
+        cleanUndefined = false,
+        cleanNull = false,
+        window: targetWindow,
+        visited = /* @__PURE__ */ new WeakMap(),
+        handleExtend = false
+      } = options;
+      if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj)) {
         return obj;
-      if (visited.has(obj))
+      }
+      if (visited.has(obj)) {
         return visited.get(obj);
-      const clone2 = (0, import_types.isArray)(obj) ? [] : {};
+      }
+      const clone2 = targetWindow ? (0, import_types.isArray)(obj) ? new targetWindow.Array() : new targetWindow.Object() : (0, import_types.isArray)(obj) ? [] : {};
       visited.set(obj, clone2);
       for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key) && !exclude.includes(key)) {
-          const value = obj[key];
-          if ((0, import_node.isDOMNode)(value)) {
-            clone2[key] = value;
-          } else if (key === "extend" && (0, import_types.isArray)(value)) {
-            clone2[key] = (0, import_array.mergeArray)(value, exclude);
-          } else if ((0, import_types.isObjectLike)(value)) {
-            clone2[key] = deepClone2(value, exclude, cleanUndefined, visited);
-          } else {
-            clone2[key] = value;
-          }
-        }
-      }
-      return clone2;
-    };
-    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
-      if ((0, import_types.isObjectLike)(obj)) {
-        if (visited.has(obj)) {
-          return obj;
+        if (!Object.prototype.hasOwnProperty.call(obj, key))
+          continue;
+        if (exclude.includes(key) || key.startsWith("__") || key === "__proto__")
+          continue;
+        const value = obj[key];
+        if (cleanUndefined && (0, import_types.isUndefined)(value) || cleanNull && (0, import_types.isNull)(value))
+          continue;
+        if ((0, import_node.isDOMNode)(value)) {
+          clone2[key] = value;
+          continue;
         }
-        visited.add(obj);
-      }
-      const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
-      for (const prop in obj) {
-        if (!Object.prototype.hasOwnProperty.call(obj, prop))
+        if (handleExtend && key === "extend" && (0, import_types.isArray)(value)) {
+          clone2[key] = (0, import_array.mergeArray)(value, exclude);
           continue;
-        const objProp = obj[prop];
-        if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
+        }
+        if ((0, import_types.isFunction)(value) && targetWindow) {
+          clone2[key] = targetWindow.eval("(" + value.toString() + ")");
           continue;
         }
-        if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited);
-        } else if ((0, import_types.isFunction)(objProp) && options.window) {
-          o[prop] = (options.window || import_globals.window).eval("(" + objProp.toString() + ")");
+        if ((0, import_types.isObjectLike)(value)) {
+          clone2[key] = deepClone2(value, {
+            ...options,
+            visited
+          });
         } else {
-          o[prop] = objProp;
+          clone2[key] = value;
         }
       }
-      return o;
+      return clone2;
     };
     var deepStringify = (obj, stringified = {}) => {
       var _a, _b;
@@ -1784,7 +1760,7 @@ var require_component = __commonJS({
         if (newChild === null)
           assignChild(null);
         else if (!childElem)
-          assignChild((0, import__.deepCloneWithExtend)(newChild));
+          assignChild((0, import__.deepClone)(newChild));
         else {
           const isSugarChildElem = checkIfSugar(childElem, parent, key);
           if (isSugarChildElem)

package/dist/cjs/utils/var.js

@@ -346,11 +346,11 @@ var require_array = __commonJS({
     var joinArrays = (...arrays) => {
       return [].concat(...arrays);
     };
-    var mergeArray = (arr, excludeFrom = []) => {
-      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepCloneWithExtend)(c, excludeFrom), excludeFrom), {});
+    var mergeArray = (arr, exclude = []) => {
+      return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, { exclude }), exclude), {});
     };
     var mergeAndCloneIfArray = (obj) => {
-      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepCloneWithExtend)(obj);
+      return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
     };
     var cutArrayBeforeValue = (arr, value) => {
       const index = arr.indexOf(value);
@@ -599,8 +599,6 @@ var require_object = __commonJS({
       createNestedObject: () => createNestedObject,
       createObjectWithoutPrototype: () => createObjectWithoutPrototype,
       deepClone: () => deepClone2,
-      deepCloneExclude: () => deepCloneExclude,
-      deepCloneWithExtend: () => deepCloneWithExtend,
       deepContains: () => deepContains,
       deepDestringify: () => deepDestringify,
       deepDiff: () => deepDiff,
@@ -694,78 +692,56 @@ var require_object = __commonJS({
       }
       return o;
     };
-    var deepCloneExclude = (obj, excludeFrom = []) => {
-      if ((0, import_types.isArray)(obj)) {
-        return obj.map((x) => deepCloneExclude(x, excludeFrom));
-      }
-      const o = {};
-      for (const k in obj) {
-        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, k);
-        if (!hasOwnProperty2 || excludeFrom.includes(k) || k.startsWith("__"))
-          continue;
-        let v = obj[k];
-        if (k === "extend" && (0, import_types.isArray)(v)) {
-          v = mergeArrayExclude(v, excludeFrom);
-        }
-        if ((0, import_types.isArray)(v)) {
-          o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
-        } else if ((0, import_types.isObject)(v)) {
-          o[k] = deepCloneExclude(v, excludeFrom);
-        } else
-          o[k] = v;
-      }
-      return o;
+    var mergeArrayExclude = (arr, exclude = []) => {
+      return arr.reduce((acc, curr) => deepMerge2(acc, deepClone2(curr, { exclude })), {});
     };
-    var mergeArrayExclude = (arr, excl = []) => {
-      return arr.reduce((acc, curr) => deepMerge2(acc, deepCloneExclude(curr, excl)), {});
-    };
-    var deepClone2 = (obj, exclude = [], cleanUndefined = false, visited = /* @__PURE__ */ new WeakMap()) => {
-      if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj))
+    var deepClone2 = (obj, options = {}) => {
+      const {
+        exclude = [],
+        cleanUndefined = false,
+        cleanNull = false,
+        window: targetWindow,
+        visited = /* @__PURE__ */ new WeakMap(),
+        handleExtend = false
+      } = options;
+      if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj)) {
         return obj;
-      if (visited.has(obj))
+      }
+      if (visited.has(obj)) {
         return visited.get(obj);
-      const clone2 = (0, import_types.isArray)(obj) ? [] : {};
+      }
+      const clone2 = targetWindow ? (0, import_types.isArray)(obj) ? new targetWindow.Array() : new targetWindow.Object() : (0, import_types.isArray)(obj) ? [] : {};
       visited.set(obj, clone2);
       for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key) && !exclude.includes(key)) {
-          const value = obj[key];
-          if ((0, import_node.isDOMNode)(value)) {
-            clone2[key] = value;
-          } else if (key === "extend" && (0, import_types.isArray)(value)) {
-            clone2[key] = (0, import_array.mergeArray)(value, exclude);
-          } else if ((0, import_types.isObjectLike)(value)) {
-            clone2[key] = deepClone2(value, exclude, cleanUndefined, visited);
-          } else {
-            clone2[key] = value;
-          }
-        }
-      }
-      return clone2;
-    };
-    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
-      if ((0, import_types.isObjectLike)(obj)) {
-        if (visited.has(obj)) {
-          return obj;
+        if (!Object.prototype.hasOwnProperty.call(obj, key))
+          continue;
+        if (exclude.includes(key) || key.startsWith("__") || key === "__proto__")
+          continue;
+        const value = obj[key];
+        if (cleanUndefined && (0, import_types.isUndefined)(value) || cleanNull && (0, import_types.isNull)(value))
+          continue;
+        if ((0, import_node.isDOMNode)(value)) {
+          clone2[key] = value;
+          continue;
         }
-        visited.add(obj);
-      }
-      const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
-      for (const prop in obj) {
-        if (!Object.prototype.hasOwnProperty.call(obj, prop))
+        if (handleExtend && key === "extend" && (0, import_types.isArray)(value)) {
+          clone2[key] = (0, import_array.mergeArray)(value, exclude);
           continue;
-        const objProp = obj[prop];
-        if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
+        }
+        if ((0, import_types.isFunction)(value) && targetWindow) {
+          clone2[key] = targetWindow.eval("(" + value.toString() + ")");
           continue;
         }
-        if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited);
-        } else if ((0, import_types.isFunction)(objProp) && options.window) {
-          o[prop] = (options.window || import_globals.window).eval("(" + objProp.toString() + ")");
+        if ((0, import_types.isObjectLike)(value)) {
+          clone2[key] = deepClone2(value, {
+            ...options,
+            visited
+          });
         } else {
-          o[prop] = objProp;
+          clone2[key] = value;
         }
       }
-      return o;
+      return clone2;
     };
     var deepStringify = (obj, stringified = {}) => {
       var _a, _b;
@@ -1784,7 +1760,7 @@ var require_component = __commonJS({
         if (newChild === null)
           assignChild(null);
         else if (!childElem)
-          assignChild((0, import__.deepCloneWithExtend)(newChild));
+          assignChild((0, import__.deepClone)(newChild));
         else {
           const isSugarChildElem = checkIfSugar(childElem, parent, key);
           if (isSugarChildElem)
@@ -2260,11 +2236,11 @@ var require_cjs2 = __commonJS({
         var joinArrays = (...arrays) => {
           return [].concat(...arrays);
         };
-        var mergeArray = (arr, excludeFrom = []) => {
-          return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepCloneWithExtend)(c, excludeFrom), excludeFrom), {});
+        var mergeArray = (arr, exclude = []) => {
+          return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, { exclude }), exclude), {});
         };
         var mergeAndCloneIfArray = (obj) => {
-          return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepCloneWithExtend)(obj);
+          return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
         };
         var cutArrayBeforeValue = (arr, value) => {
           const index = arr.indexOf(value);
@@ -2509,8 +2485,6 @@ var require_cjs2 = __commonJS({
           createNestedObject: () => createNestedObject,
           createObjectWithoutPrototype: () => createObjectWithoutPrototype,
           deepClone: () => deepClone2,
-          deepCloneExclude: () => deepCloneExclude,
-          deepCloneWithExtend: () => deepCloneWithExtend,
           deepContains: () => deepContains,
           deepDestringify: () => deepDestringify,
           deepDiff: () => deepDiff,
@@ -2604,78 +2578,56 @@ var require_cjs2 = __commonJS({
           }
           return o;
         };
-        var deepCloneExclude = (obj, excludeFrom = []) => {
-          if ((0, import_types.isArray)(obj)) {
-            return obj.map((x) => deepCloneExclude(x, excludeFrom));
-          }
-          const o = {};
-          for (const k in obj) {
-            const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, k);
-            if (!hasOwnProperty2 || excludeFrom.includes(k) || k.startsWith("__"))
-              continue;
-            let v = obj[k];
-            if (k === "extend" && (0, import_types.isArray)(v)) {
-              v = mergeArrayExclude(v, excludeFrom);
-            }
-            if ((0, import_types.isArray)(v)) {
-              o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
-            } else if ((0, import_types.isObject)(v)) {
-              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 mergeArrayExclude = (arr, exclude = []) => {
+          return arr.reduce((acc, curr) => deepMerge2(acc, deepClone2(curr, { exclude })), {});
         };
-        var deepClone2 = (obj, exclude = [], cleanUndefined = false, visited = /* @__PURE__ */ new WeakMap()) => {
-          if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj))
+        var deepClone2 = (obj, options = {}) => {
+          const {
+            exclude = [],
+            cleanUndefined = false,
+            cleanNull = false,
+            window: targetWindow,
+            visited = /* @__PURE__ */ new WeakMap(),
+            handleExtend = false
+          } = options;
+          if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj)) {
             return obj;
-          if (visited.has(obj))
+          }
+          if (visited.has(obj)) {
             return visited.get(obj);
-          const clone2 = (0, import_types.isArray)(obj) ? [] : {};
+          }
+          const clone2 = targetWindow ? (0, import_types.isArray)(obj) ? new targetWindow.Array() : new targetWindow.Object() : (0, import_types.isArray)(obj) ? [] : {};
           visited.set(obj, clone2);
           for (const key in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, key) && !exclude.includes(key)) {
-              const value = obj[key];
-              if ((0, import_node.isDOMNode)(value)) {
-                clone2[key] = value;
-              } else if (key === "extend" && (0, import_types.isArray)(value)) {
-                clone2[key] = (0, import_array.mergeArray)(value, exclude);
-              } else if ((0, import_types.isObjectLike)(value)) {
-                clone2[key] = deepClone2(value, exclude, cleanUndefined, visited);
-              } else {
-                clone2[key] = value;
-              }
-            }
-          }
-          return clone2;
-        };
-        var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
-          if ((0, import_types.isObjectLike)(obj)) {
-            if (visited.has(obj)) {
-              return obj;
+            if (!Object.prototype.hasOwnProperty.call(obj, key))
+              continue;
+            if (exclude.includes(key) || key.startsWith("__") || key === "__proto__")
+              continue;
+            const value = obj[key];
+            if (cleanUndefined && (0, import_types.isUndefined)(value) || cleanNull && (0, import_types.isNull)(value))
+              continue;
+            if ((0, import_node.isDOMNode)(value)) {
+              clone2[key] = value;
+              continue;
             }
-            visited.add(obj);
-          }
-          const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
-          for (const prop in obj) {
-            if (!Object.prototype.hasOwnProperty.call(obj, prop))
+            if (handleExtend && key === "extend" && (0, import_types.isArray)(value)) {
+              clone2[key] = (0, import_array.mergeArray)(value, exclude);
               continue;
-            const objProp = obj[prop];
-            if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
+            }
+            if ((0, import_types.isFunction)(value) && targetWindow) {
+              clone2[key] = targetWindow.eval("(" + value.toString() + ")");
               continue;
             }
-            if ((0, import_types.isObjectLike)(objProp)) {
-              o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited);
-            } else if ((0, import_types.isFunction)(objProp) && options.window) {
-              o[prop] = (options.window || import_globals.window).eval("(" + objProp.toString() + ")");
+            if ((0, import_types.isObjectLike)(value)) {
+              clone2[key] = deepClone2(value, {
+                ...options,
+                visited
+              });
             } else {
-              o[prop] = objProp;
+              clone2[key] = value;
             }
           }
-          return o;
+          return clone2;
         };
         var deepStringify = (obj, stringified = {}) => {
           var _a, _b;
@@ -3684,7 +3636,7 @@ var require_cjs2 = __commonJS({
             if (newChild === null)
               assignChild(null);
             else if (!childElem)
-              assignChild((0, import__.deepCloneWithExtend)(newChild));
+              assignChild((0, import__.deepClone)(newChild));
             else {
               const isSugarChildElem = checkIfSugar(childElem, parent, key);
               if (isSugarChildElem)

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "2.11.469",
+  "version": "2.11.475",
   "files": [
     "src",
     "dist"
@@ -21,14 +21,14 @@
     "build:esm": "npx esbuild ./src/*.js ./src/**/*.js --target=es2017 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild ./src/*.js ./src/**/*.js --target=node16 --format=cjs --outdir=dist/cjs --bundle",
     "build:iife": "npx esbuild ./src/index.js --target=es2017 --format=iife --outdir=dist/iife --bundle --minify",
-    "build": "yarn build:cjs",
-    "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
+    "build": "npm run build:cjs",
+    "prepublish": "rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
     "@domql/globals": "latest",
     "@domql/utils": "^2.5.0",
-    "@symbo.ls/utils": "^2.11.469",
+    "@symbo.ls/utils": "^2.11.475",
     "color-contrast-checker": "^1.5.0"
   },
-  "gitHead": "711b668d5e97cf07bdc3ecec069a89c4eddee826"
+  "gitHead": "d2198b5f44d161e2cf0dd8a9d88a5301192bcb02"
 }