@domql/utils 2.5.130 → 2.5.138

package/component.js

@@ -1,6 +1,15 @@
 'use strict'
 
-import { exec, isArray, isFunction, isObject, isString, joinArrays } from '.'
+import {
+  deepCloneWithExtend,
+  exec,
+  isArray,
+  isFunction,
+  isObject,
+  isString,
+  joinArrays,
+  overwriteDeep
+} from '.'
 const ENV = process.env.NODE_ENV
 
 export const checkIfKeyIsComponent = (key) => {
@@ -25,10 +34,16 @@ export const addAdditionalExtend = (newExtend, element) => {
   return { ...element, extend }
 }
 
+const checkIfSugar = (element, parent, key) => {
+  const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element
+  const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection
+  return !hasComponentAttrs || childProps || extendProps || children || childrenExtends
+}
+
 export const extendizeByKey = (element, parent, key) => {
   const { context } = parent
-  const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element
-  const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data
+  const { tag, extend, childrenExtends } = element
+  const isSugar = checkIfSugar(element)
 
   const extendFromKey = key.includes('+')
     ? key.split('+') // get array of componentKeys
@@ -44,9 +59,10 @@ export const extendizeByKey = (element, parent, key) => {
   const isExtendKeyComponent = context && context.components[extendFromKey]
 
   if (element === isExtendKeyComponent) return element
-  else if (!hasComponentAttrs || childProps) {
+  else if (isSugar) {
     return {
       extend: extendFromKey,
+      childExtend: childrenExtends,
       tag,
       props: { ...element }
     }
@@ -67,6 +83,27 @@ export const extendizeByKey = (element, parent, key) => {
   }
 }
 
+function getCapitalCaseKeys (obj) {
+  return Object.keys(obj).filter(key => /^[A-Z]/.test(key))
+}
+
+export const addChildrenIfNotInOriginal = (element, parent, key) => {
+  const childElems = getCapitalCaseKeys(element.props)
+  if (!childElems.length) return element
+
+  for (const i in childElems) {
+    const childKey = childElems[i]
+    const childElem = element[childKey]
+    const newChild = element.props[childKey]
+    if (newChild.ignoreExtend) continue
+    if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
+    else {
+      const isSugar = checkIfSugar(childElem)
+      if (!isSugar) overwriteDeep(element[childKey].props, newChild)
+    }
+  }
+}
+
 export const applyKeyComponentAsExtend = (element, parent, key) => {
   return extendizeByKey(element, parent, key) || element
 }

package/cookie.js

@@ -27,3 +27,8 @@ export const getCookie = (cname) => {
   }
   return ''
 }
+
+export const removeCookie = (cname) => {
+  if (isUndefined(document) || isUndefined(document.cookie)) return
+  document.cookie = cname + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'
+}

package/dist/cjs/component.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var component_exports = {};
 __export(component_exports, {
   addAdditionalExtend: () => addAdditionalExtend,
+  addChildrenIfNotInOriginal: () => addChildrenIfNotInOriginal,
   applyComponentFromContext: () => applyComponentFromContext,
   applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
   checkIfKeyIsComponent: () => checkIfKeyIsComponent,
@@ -53,17 +54,23 @@ const addAdditionalExtend = (newExtend, element) => {
   const extend = (0, import__.joinArrays)(receivedArray, originalArray);
   return { ...element, extend };
 };
+const checkIfSugar = (element, parent, key) => {
+  const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+  const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
+  return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+};
 const extendizeByKey = (element, parent, key) => {
   const { context } = parent;
-  const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
-  const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data;
+  const { tag, extend, childrenExtends } = element;
+  const isSugar = checkIfSugar(element);
   const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
   const isExtendKeyComponent = context && context.components[extendFromKey];
   if (element === isExtendKeyComponent)
     return element;
-  else if (!hasComponentAttrs || childProps) {
+  else if (isSugar) {
     return {
       extend: extendFromKey,
+      childExtend: childrenExtends,
       tag,
       props: { ...element }
     };
@@ -83,6 +90,28 @@ const extendizeByKey = (element, parent, key) => {
     };
   }
 };
+function getCapitalCaseKeys(obj) {
+  return Object.keys(obj).filter((key) => /^[A-Z]/.test(key));
+}
+const addChildrenIfNotInOriginal = (element, parent, key) => {
+  const childElems = getCapitalCaseKeys(element.props);
+  if (!childElems.length)
+    return element;
+  for (const i in childElems) {
+    const childKey = childElems[i];
+    const childElem = element[childKey];
+    const newChild = element.props[childKey];
+    if (newChild.ignoreExtend)
+      continue;
+    if (!childElem)
+      element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+    else {
+      const isSugar = checkIfSugar(childElem);
+      if (!isSugar)
+        (0, import__.overwriteDeep)(element[childKey].props, newChild);
+    }
+  }
+};
 const applyKeyComponentAsExtend = (element, parent, key) => {
   return extendizeByKey(element, parent, key) || element;
 };

package/dist/cjs/cookie.js

@@ -20,6 +20,7 @@ var cookie_exports = {};
 __export(cookie_exports, {
   getCookie: () => getCookie,
   isMobile: () => isMobile,
+  removeCookie: () => removeCookie,
   setCookie: () => setCookie
 });
 module.exports = __toCommonJS(cookie_exports);
@@ -49,3 +50,8 @@ const getCookie = (cname) => {
   }
   return "";
 };
+const removeCookie = (cname) => {
+  if ((0, import_types.isUndefined)(import_utils.document) || (0, import_types.isUndefined)(import_utils.document.cookie))
+    return;
+  import_utils.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+};

package/dist/cjs/object.js

@@ -29,6 +29,7 @@ __export(object_exports, {
   deepDiff: () => deepDiff,
   deepMerge: () => deepMerge,
   deepStringify: () => deepStringify,
+  deepStringifyWithMaxDepth: () => deepStringifyWithMaxDepth,
   detachFunctionsFromObject: () => detachFunctionsFromObject,
   detectInfiniteLoop: () => detectInfiniteLoop,
   diff: () => diff,
@@ -179,6 +180,11 @@ const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
   return o;
 };
 const deepStringify = (obj, stringified = {}) => {
+  var _a;
+  if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
+    console.warn("Trying to clone element or state at", obj);
+    obj = (_a = obj.parse) == null ? void 0 : _a.call(obj);
+  }
   for (const prop in obj) {
     const objProp = obj[prop];
     if ((0, import_types.isFunction)(objProp)) {
@@ -204,6 +210,39 @@ const deepStringify = (obj, stringified = {}) => {
   }
   return stringified;
 };
+const MAX_DEPTH = 100;
+const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
+  if (depth > MAX_DEPTH) {
+    console.warn(`Maximum depth exceeded at path: ${path}. Possible circular reference.`);
+    return "[MAX_DEPTH_EXCEEDED]";
+  }
+  for (const prop in obj) {
+    const currentPath = path ? `${path}.${prop}` : prop;
+    const objProp = obj[prop];
+    if ((0, import_types.isFunction)(objProp)) {
+      stringified[prop] = objProp.toString();
+    } else if ((0, import_types.isObject)(objProp)) {
+      stringified[prop] = {};
+      deepStringifyWithMaxDepth(objProp, stringified[prop], depth + 1, currentPath);
+    } else if ((0, import_types.isArray)(objProp)) {
+      stringified[prop] = [];
+      objProp.forEach((v, i) => {
+        const itemPath = `${currentPath}[${i}]`;
+        if ((0, import_types.isObject)(v)) {
+          stringified[prop][i] = {};
+          deepStringifyWithMaxDepth(v, stringified[prop][i], depth + 1, itemPath);
+        } else if ((0, import_types.isFunction)(v)) {
+          stringified[prop][i] = v.toString();
+        } else {
+          stringified[prop][i] = v;
+        }
+      });
+    } else {
+      stringified[prop] = objProp;
+    }
+  }
+  return stringified;
+};
 const objectToString = (obj = {}, indent = 0) => {
   const spaces = "  ".repeat(indent);
   let str = "{\n";

package/object.js

@@ -199,6 +199,11 @@ export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}) =
  * Stringify object
  */
 export const deepStringify = (obj, stringified = {}) => {
+  if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
+    console.warn('Trying to clone element or state at', obj)
+    obj = obj.parse?.()
+  }
+
   for (const prop in obj) {
     const objProp = obj[prop]
     if (isFunction(objProp)) {
@@ -225,6 +230,42 @@ export const deepStringify = (obj, stringified = {}) => {
   return stringified
 }
 
+const MAX_DEPTH = 100 // Adjust this value as needed
+export const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = '') => {
+  if (depth > MAX_DEPTH) {
+    console.warn(`Maximum depth exceeded at path: ${path}. Possible circular reference.`)
+    return '[MAX_DEPTH_EXCEEDED]'
+  }
+
+  for (const prop in obj) {
+    const currentPath = path ? `${path}.${prop}` : prop
+    const objProp = obj[prop]
+
+    if (isFunction(objProp)) {
+      stringified[prop] = objProp.toString()
+    } else if (isObject(objProp)) {
+      stringified[prop] = {}
+      deepStringifyWithMaxDepth(objProp, stringified[prop], depth + 1, currentPath)
+    } else if (isArray(objProp)) {
+      stringified[prop] = []
+      objProp.forEach((v, i) => {
+        const itemPath = `${currentPath}[${i}]`
+        if (isObject(v)) {
+          stringified[prop][i] = {}
+          deepStringifyWithMaxDepth(v, stringified[prop][i], depth + 1, itemPath)
+        } else if (isFunction(v)) {
+          stringified[prop][i] = v.toString()
+        } else {
+          stringified[prop][i] = v
+        }
+      })
+    } else {
+      stringified[prop] = objProp
+    }
+  }
+  return stringified
+}
+
 export const objectToString = (obj = {}, indent = 0) => {
   const spaces = '  '.repeat(indent)
   let str = '{\n'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.130",
+  "version": "2.5.138",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -25,7 +25,7 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "88815c621b7aeb9458c779643934c0d2e5305cd2",
+  "gitHead": "91afb60b8354f1a95c3364be94ba74612f907918",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }