@symbo.ls/utils 2.11.446 → 2.11.453

package/dist/cjs/index.js

@@ -302,6 +302,8 @@ var require_array = __commonJS({
       arraysEqual: () => arraysEqual,
       cutArrayAfterValue: () => cutArrayAfterValue,
       cutArrayBeforeValue: () => cutArrayBeforeValue,
+      filterArrays: () => filterArrays,
+      filterArraysFast: () => filterArraysFast,
       getFrequencyInArray: () => getFrequencyInArray,
       joinArrays: () => joinArrays,
       mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -410,6 +412,13 @@ var require_array = __commonJS({
       }
       return true;
     };
+    var filterArrays = (sourceArr, excludeArr) => {
+      return sourceArr.filter((item) => !excludeArr.includes(item));
+    };
+    var filterArraysFast = (sourceArr, excludeArr) => {
+      const excludeSet = new Set(excludeArr);
+      return sourceArr.filter((item) => !excludeSet.has(item));
+    };
   }
 });
 
@@ -603,9 +612,11 @@ var require_object = __commonJS({
       diff: () => diff,
       diffArrays: () => diffArrays,
       diffObjects: () => diffObjects,
+      excludeKeysFromObject: () => excludeKeysFromObject,
       exec: () => exec,
       flattenRecursive: () => flattenRecursive,
       hasOwnProperty: () => hasOwnProperty,
+      isCyclic: () => isCyclic,
       isEmpty: () => isEmpty,
       isEmptyObject: () => isEmptyObject,
       isEqualDeep: () => isEqualDeep,
@@ -731,20 +742,28 @@ var require_object = __commonJS({
       }
       return clone2;
     };
-    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
+    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
+      if ((0, import_types.isObjectLike)(obj)) {
+        if (visited.has(obj)) {
+          return obj;
+        }
+        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))
           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 (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
           continue;
+        }
         if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
+          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() + ")");
-        } else
+        } else {
           o[prop] = objProp;
+        }
       }
       return o;
     };
@@ -921,7 +940,7 @@ var require_object = __commonJS({
     };
     var stringToObject = (str, opts = { verbose: true }) => {
       try {
-        return import_globals.window.eval("(" + str + ")");
+        return str ? import_globals.window.eval("(" + str + ")") : {};
       } catch (e) {
         if (opts.verbose)
           console.warn(e);
@@ -1001,20 +1020,27 @@ var require_object = __commonJS({
         return acc;
       }, deletedValues);
     };
-    var overwrite = (element, params, excludeFrom = []) => {
-      const { ref } = element;
-      const changes = {};
+    var overwrite = (element, params, opts = {}) => {
+      const { __ref: ref } = element;
+      const excl = opts.exclude || [];
+      const allowUnderscore = opts.preventUnderscore;
+      const preventCaching = opts.preventCaching;
       for (const e in params) {
-        if (excludeFrom.includes(e) || e.startsWith("__"))
+        if (excl.includes(e) || !allowUnderscore && e.startsWith("__"))
           continue;
         const elementProp = element[e];
         const paramsProp = params[e];
-        if (paramsProp) {
-          ref.__cache[e] = changes[e] = elementProp;
-          ref[e] = paramsProp;
+        if (paramsProp !== void 0) {
+          element[e] = paramsProp;
+          if (ref && !preventCaching) {
+            ref.__cache[e] = elementProp;
+          }
+          if ((0, import_types.isObject)(opts.diff)) {
+            diff[e] = elementProp;
+          }
         }
       }
-      return changes;
+      return element;
     };
     var overwriteShallow = (obj, params, excludeFrom = []) => {
       for (const e in params) {
@@ -1024,23 +1050,26 @@ var require_object = __commonJS({
       }
       return obj;
     };
-    var overwriteDeep = (obj, params, excludeFrom = [], visited = /* @__PURE__ */ new WeakMap()) => {
+    var overwriteDeep = (obj, params, opts = {}, visited = /* @__PURE__ */ new WeakMap()) => {
+      const excl = opts.exclude || [];
+      const forcedExclude = opts.preventForce ? [] : ["node", "window"];
       if (!(0, import_types.isObjectLike)(obj) || !(0, import_types.isObjectLike)(params) || (0, import_node.isDOMNode)(obj) || (0, import_node.isDOMNode)(params)) {
         return params;
       }
-      if (visited.has(obj)) {
+      if (visited.has(obj))
         return visited.get(obj);
-      }
       visited.set(obj, obj);
       for (const e in params) {
-        if (e === "__ref" || excludeFrom.includes(e) || e.startsWith("__"))
+        if (!Object.hasOwnProperty.call(params, e))
+          continue;
+        if (excl.includes(e) || forcedExclude && e.startsWith("__"))
           continue;
         const objProp = obj[e];
         const paramsProp = params[e];
         if ((0, import_node.isDOMNode)(paramsProp)) {
           obj[e] = paramsProp;
         } else if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-          obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited);
+          obj[e] = overwriteDeep(objProp, paramsProp, opts, visited);
         } else if (paramsProp !== void 0) {
           obj[e] = paramsProp;
         }
@@ -1203,6 +1232,30 @@ var require_object = __commonJS({
         }
       }
     };
+    var isCyclic = (obj) => {
+      const seenObjects = [];
+      function detect(obj2) {
+        if (obj2 && typeof obj2 === "object") {
+          if (seenObjects.indexOf(obj2) !== -1) {
+            return true;
+          }
+          seenObjects.push(obj2);
+          for (const key in obj2) {
+            if (Object.hasOwnProperty.call(obj2, key) && detect(obj2[key])) {
+              console.log(obj2, "cycle at " + key);
+              return true;
+            }
+          }
+        }
+        return false;
+      }
+      return detect(obj);
+    };
+    var excludeKeysFromObject = (obj, excludedKeys) => {
+      const result = { ...obj };
+      excludedKeys.forEach((key) => delete result[key]);
+      return result;
+    };
   }
 });
 
@@ -1622,6 +1675,8 @@ var require_component = __commonJS({
       return /^[a-z]*$/.test(firstCharKey);
     };
     var addAdditionalExtend = (newExtend, element) => {
+      if (!newExtend)
+        return element;
       const { extend: elementExtend } = element;
       const originalArray = (0, import__.isArray)(elementExtend) ? elementExtend : [elementExtend];
       const receivedArray = (0, import__.isArray)(newExtend) ? newExtend : [newExtend];
@@ -1629,8 +1684,23 @@ var require_component = __commonJS({
       return { ...element, extend };
     };
     var checkIfSugar = (element, parent, key) => {
-      const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+      const {
+        extend,
+        props,
+        childExtend,
+        extends: extendProps,
+        childrenExtends,
+        childProps,
+        children,
+        on,
+        $collection,
+        $stateCollection,
+        $propsCollection
+      } = element;
       const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
+      if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
+        element.error("Sugar component includes params for builtin components");
+      }
       return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
     };
     var extendizeByKey = (element, parent, key) => {
@@ -1642,11 +1712,11 @@ var require_component = __commonJS({
       if (element === isExtendKeyComponent)
         return element;
       else if (isSugar) {
-        const newElem = {
+        const newElem = addAdditionalExtend(element.extends, {
           extend: extendFromKey,
           tag,
           props: { ...element }
-        };
+        });
         if (childrenExtends)
           newElem.childExtend = childrenExtends;
         return newElem;

package/dist/cjs/scaling.js

@@ -302,6 +302,8 @@ var require_array = __commonJS({
       arraysEqual: () => arraysEqual,
       cutArrayAfterValue: () => cutArrayAfterValue,
       cutArrayBeforeValue: () => cutArrayBeforeValue,
+      filterArrays: () => filterArrays,
+      filterArraysFast: () => filterArraysFast,
       getFrequencyInArray: () => getFrequencyInArray,
       joinArrays: () => joinArrays,
       mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -410,6 +412,13 @@ var require_array = __commonJS({
       }
       return true;
     };
+    var filterArrays = (sourceArr, excludeArr) => {
+      return sourceArr.filter((item) => !excludeArr.includes(item));
+    };
+    var filterArraysFast = (sourceArr, excludeArr) => {
+      const excludeSet = new Set(excludeArr);
+      return sourceArr.filter((item) => !excludeSet.has(item));
+    };
   }
 });
 
@@ -603,9 +612,11 @@ var require_object = __commonJS({
       diff: () => diff,
       diffArrays: () => diffArrays,
       diffObjects: () => diffObjects,
+      excludeKeysFromObject: () => excludeKeysFromObject,
       exec: () => exec,
       flattenRecursive: () => flattenRecursive,
       hasOwnProperty: () => hasOwnProperty,
+      isCyclic: () => isCyclic,
       isEmpty: () => isEmpty,
       isEmptyObject: () => isEmptyObject,
       isEqualDeep: () => isEqualDeep,
@@ -731,20 +742,28 @@ var require_object = __commonJS({
       }
       return clone2;
     };
-    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
+    var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
+      if ((0, import_types.isObjectLike)(obj)) {
+        if (visited.has(obj)) {
+          return obj;
+        }
+        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))
           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 (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
           continue;
+        }
         if ((0, import_types.isObjectLike)(objProp)) {
-          o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
+          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() + ")");
-        } else
+        } else {
           o[prop] = objProp;
+        }
       }
       return o;
     };
@@ -921,7 +940,7 @@ var require_object = __commonJS({
     };
     var stringToObject = (str, opts = { verbose: true }) => {
       try {
-        return import_globals.window.eval("(" + str + ")");
+        return str ? import_globals.window.eval("(" + str + ")") : {};
       } catch (e) {
         if (opts.verbose)
           console.warn(e);
@@ -1001,20 +1020,27 @@ var require_object = __commonJS({
         return acc;
       }, deletedValues);
     };
-    var overwrite = (element, params, excludeFrom = []) => {
-      const { ref } = element;
-      const changes = {};
+    var overwrite = (element, params, opts = {}) => {
+      const { __ref: ref } = element;
+      const excl = opts.exclude || [];
+      const allowUnderscore = opts.preventUnderscore;
+      const preventCaching = opts.preventCaching;
       for (const e in params) {
-        if (excludeFrom.includes(e) || e.startsWith("__"))
+        if (excl.includes(e) || !allowUnderscore && e.startsWith("__"))
           continue;
         const elementProp = element[e];
         const paramsProp = params[e];
-        if (paramsProp) {
-          ref.__cache[e] = changes[e] = elementProp;
-          ref[e] = paramsProp;
+        if (paramsProp !== void 0) {
+          element[e] = paramsProp;
+          if (ref && !preventCaching) {
+            ref.__cache[e] = elementProp;
+          }
+          if ((0, import_types.isObject)(opts.diff)) {
+            diff[e] = elementProp;
+          }
         }
       }
-      return changes;
+      return element;
     };
     var overwriteShallow = (obj, params, excludeFrom = []) => {
       for (const e in params) {
@@ -1024,23 +1050,26 @@ var require_object = __commonJS({
       }
       return obj;
     };
-    var overwriteDeep = (obj, params, excludeFrom = [], visited = /* @__PURE__ */ new WeakMap()) => {
+    var overwriteDeep = (obj, params, opts = {}, visited = /* @__PURE__ */ new WeakMap()) => {
+      const excl = opts.exclude || [];
+      const forcedExclude = opts.preventForce ? [] : ["node", "window"];
       if (!(0, import_types.isObjectLike)(obj) || !(0, import_types.isObjectLike)(params) || (0, import_node.isDOMNode)(obj) || (0, import_node.isDOMNode)(params)) {
         return params;
       }
-      if (visited.has(obj)) {
+      if (visited.has(obj))
         return visited.get(obj);
-      }
       visited.set(obj, obj);
       for (const e in params) {
-        if (e === "__ref" || excludeFrom.includes(e) || e.startsWith("__"))
+        if (!Object.hasOwnProperty.call(params, e))
+          continue;
+        if (excl.includes(e) || forcedExclude && e.startsWith("__"))
           continue;
         const objProp = obj[e];
         const paramsProp = params[e];
         if ((0, import_node.isDOMNode)(paramsProp)) {
           obj[e] = paramsProp;
         } else if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-          obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited);
+          obj[e] = overwriteDeep(objProp, paramsProp, opts, visited);
         } else if (paramsProp !== void 0) {
           obj[e] = paramsProp;
         }
@@ -1203,6 +1232,30 @@ var require_object = __commonJS({
         }
       }
     };
+    var isCyclic = (obj) => {
+      const seenObjects = [];
+      function detect(obj2) {
+        if (obj2 && typeof obj2 === "object") {
+          if (seenObjects.indexOf(obj2) !== -1) {
+            return true;
+          }
+          seenObjects.push(obj2);
+          for (const key in obj2) {
+            if (Object.hasOwnProperty.call(obj2, key) && detect(obj2[key])) {
+              console.log(obj2, "cycle at " + key);
+              return true;
+            }
+          }
+        }
+        return false;
+      }
+      return detect(obj);
+    };
+    var excludeKeysFromObject = (obj, excludedKeys) => {
+      const result = { ...obj };
+      excludedKeys.forEach((key) => delete result[key]);
+      return result;
+    };
   }
 });
 
@@ -1622,6 +1675,8 @@ var require_component = __commonJS({
       return /^[a-z]*$/.test(firstCharKey);
     };
     var addAdditionalExtend = (newExtend, element) => {
+      if (!newExtend)
+        return element;
       const { extend: elementExtend } = element;
       const originalArray = (0, import__.isArray)(elementExtend) ? elementExtend : [elementExtend];
       const receivedArray = (0, import__.isArray)(newExtend) ? newExtend : [newExtend];
@@ -1629,8 +1684,23 @@ var require_component = __commonJS({
       return { ...element, extend };
     };
     var checkIfSugar = (element, parent, key) => {
-      const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+      const {
+        extend,
+        props,
+        childExtend,
+        extends: extendProps,
+        childrenExtends,
+        childProps,
+        children,
+        on,
+        $collection,
+        $stateCollection,
+        $propsCollection
+      } = element;
       const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
+      if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
+        element.error("Sugar component includes params for builtin components");
+      }
       return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
     };
     var extendizeByKey = (element, parent, key) => {
@@ -1642,11 +1712,11 @@ var require_component = __commonJS({
       if (element === isExtendKeyComponent)
         return element;
       else if (isSugar) {
-        const newElem = {
+        const newElem = addAdditionalExtend(element.extends, {
           extend: extendFromKey,
           tag,
           props: { ...element }
-        };
+        });
         if (childrenExtends)
           newElem.childExtend = childrenExtends;
         return newElem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/utils",
-  "version": "2.11.446",
+  "version": "2.11.453",
   "author": "symbo.ls",
   "files": [
     "src",
@@ -26,5 +26,5 @@
   "dependencies": {
     "@domql/utils": "^2.5.0"
   },
-  "gitHead": "d042e0c4fc9379b0ca7584f6405cfa2e7c1301d4"
+  "gitHead": "8e5458a957b9d2c75944023e2c31bab157034314"
 }