@domql/utils 2.5.148 → 2.5.151

package/component.js

@@ -28,6 +28,7 @@ export const checkIfKeyIsProperty = (key) => {
 }
 
 export const addAdditionalExtend = (newExtend, element) => {
+  if (!newExtend) return element
   const { extend: elementExtend } = element
   const originalArray = isArray(elementExtend) ? elementExtend : [elementExtend]
   const receivedArray = isArray(newExtend) ? newExtend : [newExtend]
@@ -36,15 +37,30 @@ export const addAdditionalExtend = (newExtend, element) => {
 }
 
 const 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)) {
+    parent.error('Sugar component includes params for builtin components', { verbose: true })
+  }
   return !hasComponentAttrs || childProps || extendProps || children || childrenExtends
 }
 
 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
@@ -54,18 +70,14 @@ 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) {
-    const newElem = {
+    const newElem = addAdditionalExtend(element.extends, {
       extend: extendFromKey,
       tag,
       props: { ...element }
-    }
+    })
     if (childrenExtends) newElem.childExtend = childrenExtends
     return newElem
   } else if (!extend || extend === true) {
@@ -100,7 +112,7 @@ export const addChildrenIfNotInOriginal = (element, parent, key) => {
     if (newChild?.ignoreExtend) continue
     if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
     else {
-      const isSugar = checkIfSugar(childElem)
+      const isSugar = checkIfSugar(childElem, parent, key)
       if (!isSugar) continue
       const inheritedChildElem = element[childKey].props
       if (isObjectLike(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

@@ -49,6 +49,8 @@ const checkIfKeyIsProperty = (key) => {
   return /^[a-z]*$/.test(firstCharKey);
 };
 const 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];
@@ -56,24 +58,39 @@ 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 {
+    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)) {
+    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)
     return element;
   else if (isSugar) {
-    const newElem = {
+    const newElem = addAdditionalExtend(element.extends, {
       extend: extendFromKey,
       tag,
       props: { ...element }
-    };
+    });
     if (childrenExtends)
       newElem.childExtend = childrenExtends;
     return newElem;
@@ -109,7 +126,7 @@ const addChildrenIfNotInOriginal = (element, parent, key) => {
     if (!childElem)
       element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
     else {
-      const isSugar = checkIfSugar(childElem);
+      const isSugar = checkIfSugar(childElem, parent, key);
       if (!isSugar)
         continue;
       const inheritedChildElem = element[childKey].props;

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.148",
+  "version": "2.5.151",
   "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": "6706914c73f3c9669ff443c0c890dea1f4e908ab",
+  "gitHead": "f37b51f84b8bca80b8bce7887e83d61ac25eb3d5",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }