@domql/utils 2.5.150 → 2.5.152

package/component.js

@@ -6,10 +6,8 @@ import {
   isArray,
   isFunction,
   isObject,
-  isObjectLike,
   isString,
-  joinArrays,
-  overwriteDeep
+  joinArrays
 } from '.'
 const ENV = process.env.NODE_ENV
 
@@ -52,7 +50,7 @@ const checkIfSugar = (element, parent, key) => {
   } = 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')
+    parent.error('Sugar component includes params for builtin components', { verbose: true })
   }
   return !hasComponentAttrs || childProps || extendProps || children || childrenExtends
 }
@@ -60,7 +58,7 @@ const checkIfSugar = (element, parent, key) => {
 export const extendizeByKey = (element, parent, key) => {
   const { context } = parent
   const { tag, extend, childrenExtends } = element
-  const isSugar = checkIfSugar(element)
+  const isSugar = checkIfSugar(element, parent, key)
 
   const extendFromKey = key.includes('+')
     ? key.split('+') // get array of componentKeys
@@ -70,9 +68,6 @@ export const extendizeByKey = (element, parent, key) => {
         ? [key.split('.')[0]] // get component key split .
         : [key]
 
-  // console.log(extendFromKey)
-  // console.log(context, context?.components)
-  // console.log(element)
   const isExtendKeyComponent = context && context.components[extendFromKey]
   if (element === isExtendKeyComponent) return element
   else if (isSugar) {
@@ -112,20 +107,24 @@ export const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i]
     const childElem = element[childKey]
     const newChild = element.props[childKey]
+
+    const assignChild = (val) => {
+      element[childKey] = val
+      delete element.props[childKey]
+    }
+
     if (newChild?.ignoreExtend) continue
-    if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
+    if (newChild === null && childElem) {
+      console.log('is null', element)
+      assignChild(null)
+    } else if (!childElem) assignChild(deepCloneWithExtend(newChild))
     else {
-      const isSugar = checkIfSugar(childElem)
-      if (!isSugar) continue
-      const inheritedChildElem = element[childKey].props
-      if (isObjectLike(newChild)) {
-        overwriteDeep(inheritedChildElem, newChild)
-      } else if (isFunction(newChild)) {
-        element[childKey] = {
-          extend: element[childKey],
-          props: newChild
-        }
-      }
+      const isSugarChildElem = checkIfSugar(childElem, parent, key)
+      if (isSugarChildElem) continue
+      assignChild({
+        extend: element[childKey],
+        props: newChild
+      })
     }
   }
 }

package/cookie.js

@@ -32,3 +32,37 @@ export const removeCookie = (cname) => {
   if (isUndefined(document) || isUndefined(document.cookie)) return
   document.cookie = cname + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'
 }
+
+/**
+   * Load item from the localStorage
+   *
+   * @param key -- string to identify the storage item
+   */
+export function getLocalStorage (key) {
+  let savedJSON
+
+  if (window.localStorage) {
+    try {
+      savedJSON = JSON.parse(window.localStorage.getItem(key))
+    } catch (e) {}
+  }
+
+  if (typeof savedJSON !== 'undefined') {
+    return savedJSON
+  }
+}
+/**
+ * Save the data to window.localStorage
+ *
+ * @param key  - local storage key to save the data under
+ * @param data - the data to save
+ */
+export function setLocalStorage (key, data) {
+  if (data && window.localStorage) {
+    if (typeof data === 'object') {
+      window.localStorage.setItem(key, JSON.stringify(data))
+    } else {
+      window.localStorage.setItem(key, data)
+    }
+  }
+}

package/dist/cjs/component.js

@@ -73,14 +73,14 @@ const checkIfSugar = (element, parent, key) => {
   } = 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");
+    parent.error("Sugar component includes params for builtin components", { verbose: true });
   }
   return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
 };
 const extendizeByKey = (element, parent, key) => {
   const { context } = parent;
   const { tag, extend, childrenExtends } = element;
-  const isSugar = checkIfSugar(element);
+  const isSugar = checkIfSugar(element, parent, key);
   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)
@@ -121,23 +121,25 @@ const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i];
     const childElem = element[childKey];
     const newChild = element.props[childKey];
+    const assignChild = (val) => {
+      element[childKey] = val;
+      delete element.props[childKey];
+    };
     if (newChild == null ? void 0 : newChild.ignoreExtend)
       continue;
-    if (!childElem)
-      element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+    if (newChild === null && childElem) {
+      console.log("is null", element);
+      assignChild(null);
+    } else if (!childElem)
+      assignChild((0, import__.deepCloneWithExtend)(newChild));
     else {
-      const isSugar = checkIfSugar(childElem);
-      if (!isSugar)
+      const isSugarChildElem = checkIfSugar(childElem, parent, key);
+      if (isSugarChildElem)
         continue;
-      const inheritedChildElem = element[childKey].props;
-      if ((0, import__.isObjectLike)(newChild)) {
-        (0, import__.overwriteDeep)(inheritedChildElem, newChild);
-      } else if ((0, import__.isFunction)(newChild)) {
-        element[childKey] = {
-          extend: element[childKey],
-          props: newChild
-        };
-      }
+      assignChild({
+        extend: element[childKey],
+        props: newChild
+      });
     }
   }
 };

package/dist/cjs/cookie.js

@@ -19,9 +19,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cookie_exports = {};
 __export(cookie_exports, {
   getCookie: () => getCookie,
+  getLocalStorage: () => getLocalStorage,
   isMobile: () => isMobile,
   removeCookie: () => removeCookie,
-  setCookie: () => setCookie
+  setCookie: () => setCookie,
+  setLocalStorage: () => setLocalStorage
 });
 module.exports = __toCommonJS(cookie_exports);
 var import_types = require("./types");
@@ -55,3 +57,24 @@ const removeCookie = (cname) => {
     return;
   import_utils.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
 };
+function getLocalStorage(key) {
+  let savedJSON;
+  if (window.localStorage) {
+    try {
+      savedJSON = JSON.parse(window.localStorage.getItem(key));
+    } catch (e) {
+    }
+  }
+  if (typeof savedJSON !== "undefined") {
+    return savedJSON;
+  }
+}
+function setLocalStorage(key, data) {
+  if (data && window.localStorage) {
+    if (typeof data === "object") {
+      window.localStorage.setItem(key, JSON.stringify(data));
+    } else {
+      window.localStorage.setItem(key, data);
+    }
+  }
+}

package/dist/cjs/object.js

@@ -191,10 +191,10 @@ const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited
   return o;
 };
 const deepStringify = (obj, stringified = {}) => {
-  var _a;
+  var _a, _b;
   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);
+    (obj.__element || ((_a = obj.parent) == null ? void 0 : _a.__element)).warn("Trying to clone element or state at", obj);
+    obj = (_b = obj.parse) == null ? void 0 : _b.call(obj);
   }
   for (const prop in obj) {
     const objProp = obj[prop];

package/object.js

@@ -217,7 +217,7 @@ export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}, v
  */
 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.__element || obj.parent?.__element).warn('Trying to clone element or state at', obj)
     obj = obj.parse?.()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.150",
+  "version": "2.5.152",
   "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": "8e04bcc422d23520fd394f79be15dc4336cd59a6",
+  "gitHead": "249d2545f3ee35b450ca90d399fc7c3e54a4a7bc",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }