@domql/utils 2.5.125 → 2.5.130

package/component.js

@@ -0,0 +1,159 @@
+'use strict'
+
+import { exec, isArray, isFunction, isObject, isString, joinArrays } from '.'
+const ENV = process.env.NODE_ENV
+
+export const checkIfKeyIsComponent = (key) => {
+  const isFirstKeyString = isString(key)
+  if (!isFirstKeyString) return
+  const firstCharKey = key.slice(0, 1)
+  return /^[A-Z]*$/.test(firstCharKey)
+}
+
+export const checkIfKeyIsProperty = (key) => {
+  const isFirstKeyString = isString(key)
+  if (!isFirstKeyString) return
+  const firstCharKey = key.slice(0, 1)
+  return /^[a-z]*$/.test(firstCharKey)
+}
+
+export const addAdditionalExtend = (newExtend, element) => {
+  const { extend: elementExtend } = element
+  const originalArray = isArray(elementExtend) ? elementExtend : [elementExtend]
+  const receivedArray = isArray(newExtend) ? newExtend : [newExtend]
+  const extend = joinArrays(receivedArray, originalArray)
+  return { ...element, extend }
+}
+
+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 extendFromKey = key.includes('+')
+    ? key.split('+') // get array of componentKeys
+    : key.includes('_')
+      ? [key.split('_')[0]] // get component key split _
+      : key.includes('.') && !checkIfKeyIsComponent(key.split('.')[1])
+        ? [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 (!hasComponentAttrs || childProps) {
+    return {
+      extend: extendFromKey,
+      tag,
+      props: { ...element }
+    }
+  } else if (!extend || extend === true) {
+    return {
+      ...element,
+      tag,
+      extend: extendFromKey
+    }
+  } else if (extend) {
+    return addAdditionalExtend(extendFromKey, element)
+  } else if (isFunction(element)) {
+    return {
+      extend: extendFromKey,
+      tag,
+      props: { ...exec(element, parent) }
+    }
+  }
+}
+
+export const applyKeyComponentAsExtend = (element, parent, key) => {
+  return extendizeByKey(element, parent, key) || element
+}
+
+export const applyComponentFromContext = (element, parent, options) => {
+  const { context } = element
+
+  if (!context || !context.components) return
+
+  const { components } = context
+  const { extend } = element
+  const execExtend = exec(extend, element)
+  if (isString(execExtend)) {
+    const componentExists = components[execExtend] || components['smbls.' + execExtend]
+    if (componentExists) element.extend = componentExists
+    else {
+      if ((ENV === 'test' || ENV === 'development') && options.verbose) {
+        console.warn(execExtend, 'is not in library', components, element)
+        console.warn('replacing with ', {})
+      }
+      element.extend = {}
+    }
+  }
+}
+
+export const isVariant = (param) => {
+  if (!isString(param)) return
+  const firstCharKey = param.slice(0, 1)
+  // return (firstCharKey === '.' || firstCharKey === '$')
+  return (firstCharKey === '.')
+}
+
+export const hasVariantProp = (element) => {
+  const { props } = element
+  if (isObject(props) && isString(props.variant)) return true
+}
+
+export const getChildrenComponentsByKey = (key, el) => {
+  if (key === el.key || el.__ref.__componentKey === key) {
+    return el
+  }
+
+  // Check if the prop is "extend" and it's either a string or an array
+  if (el.extend) {
+    // Add the value of the extend key to the result array
+    const foundString = isString(el.extend) && el.extend === key
+    const foundInArray = isArray(el.extend) && el.extend.filter(v => v === key).length
+    if (foundString || foundInArray) return el
+  }
+
+  if (el.parent && el.parent.childExtend) {
+    // Add the value of the extend key to the result array
+    const foundString = isString(el.parent.childExtend) && el.parent.childExtend === key
+    const foundInArray = isArray(el.parent.childExtend) && el.parent.childExtend.filter(v => v === key).length
+    if (foundString || foundInArray) return el
+  }
+}
+
+export const getExtendsInElement = (obj) => {
+  let result = []
+
+  function traverse (o) {
+    for (const key in o) {
+      if (Object.hasOwnProperty.call(o, key)) {
+        // Check if the key starts with a capital letter and exclude keys like @mobileL, $propsCollection
+        if (checkIfKeyIsComponent(key)) {
+          result.push(key)
+        }
+
+        // Check if the key is "extend" and it's either a string or an array
+        if (key === 'extend') {
+          // Add the value of the extend key to the result array
+          if (typeof o[key] === 'string') {
+            result.push(o[key])
+          } else if (Array.isArray(o[key])) {
+            result = result.concat(o[key])
+          }
+        }
+
+        // If the property is an object, traverse it
+        if (typeof o[key] === 'object' && o[key] !== null) {
+          traverse(o[key])
+        }
+      }
+    }
+  }
+
+  traverse(obj)
+  return result
+}

package/dist/cjs/component.js

@@ -0,0 +1,160 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var component_exports = {};
+__export(component_exports, {
+  addAdditionalExtend: () => addAdditionalExtend,
+  applyComponentFromContext: () => applyComponentFromContext,
+  applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
+  checkIfKeyIsComponent: () => checkIfKeyIsComponent,
+  checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+  extendizeByKey: () => extendizeByKey,
+  getChildrenComponentsByKey: () => getChildrenComponentsByKey,
+  getExtendsInElement: () => getExtendsInElement,
+  hasVariantProp: () => hasVariantProp,
+  isVariant: () => isVariant
+});
+module.exports = __toCommonJS(component_exports);
+var import__ = require(".");
+const ENV = "development";
+const checkIfKeyIsComponent = (key) => {
+  const isFirstKeyString = (0, import__.isString)(key);
+  if (!isFirstKeyString)
+    return;
+  const firstCharKey = key.slice(0, 1);
+  return /^[A-Z]*$/.test(firstCharKey);
+};
+const checkIfKeyIsProperty = (key) => {
+  const isFirstKeyString = (0, import__.isString)(key);
+  if (!isFirstKeyString)
+    return;
+  const firstCharKey = key.slice(0, 1);
+  return /^[a-z]*$/.test(firstCharKey);
+};
+const addAdditionalExtend = (newExtend, element) => {
+  const { extend: elementExtend } = element;
+  const originalArray = (0, import__.isArray)(elementExtend) ? elementExtend : [elementExtend];
+  const receivedArray = (0, import__.isArray)(newExtend) ? newExtend : [newExtend];
+  const extend = (0, import__.joinArrays)(receivedArray, originalArray);
+  return { ...element, extend };
+};
+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 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) {
+    return {
+      extend: extendFromKey,
+      tag,
+      props: { ...element }
+    };
+  } else if (!extend || extend === true) {
+    return {
+      ...element,
+      tag,
+      extend: extendFromKey
+    };
+  } else if (extend) {
+    return addAdditionalExtend(extendFromKey, element);
+  } else if ((0, import__.isFunction)(element)) {
+    return {
+      extend: extendFromKey,
+      tag,
+      props: { ...(0, import__.exec)(element, parent) }
+    };
+  }
+};
+const applyKeyComponentAsExtend = (element, parent, key) => {
+  return extendizeByKey(element, parent, key) || element;
+};
+const applyComponentFromContext = (element, parent, options) => {
+  const { context } = element;
+  if (!context || !context.components)
+    return;
+  const { components } = context;
+  const { extend } = element;
+  const execExtend = (0, import__.exec)(extend, element);
+  if ((0, import__.isString)(execExtend)) {
+    const componentExists = components[execExtend] || components["smbls." + execExtend];
+    if (componentExists)
+      element.extend = componentExists;
+    else {
+      if ((ENV === "test" || ENV === "development") && options.verbose) {
+        console.warn(execExtend, "is not in library", components, element);
+        console.warn("replacing with ", {});
+      }
+      element.extend = {};
+    }
+  }
+};
+const isVariant = (param) => {
+  if (!(0, import__.isString)(param))
+    return;
+  const firstCharKey = param.slice(0, 1);
+  return firstCharKey === ".";
+};
+const hasVariantProp = (element) => {
+  const { props } = element;
+  if ((0, import__.isObject)(props) && (0, import__.isString)(props.variant))
+    return true;
+};
+const getChildrenComponentsByKey = (key, el) => {
+  if (key === el.key || el.__ref.__componentKey === key) {
+    return el;
+  }
+  if (el.extend) {
+    const foundString = (0, import__.isString)(el.extend) && el.extend === key;
+    const foundInArray = (0, import__.isArray)(el.extend) && el.extend.filter((v) => v === key).length;
+    if (foundString || foundInArray)
+      return el;
+  }
+  if (el.parent && el.parent.childExtend) {
+    const foundString = (0, import__.isString)(el.parent.childExtend) && el.parent.childExtend === key;
+    const foundInArray = (0, import__.isArray)(el.parent.childExtend) && el.parent.childExtend.filter((v) => v === key).length;
+    if (foundString || foundInArray)
+      return el;
+  }
+};
+const getExtendsInElement = (obj) => {
+  let result = [];
+  function traverse(o) {
+    for (const key in o) {
+      if (Object.hasOwnProperty.call(o, key)) {
+        if (checkIfKeyIsComponent(key)) {
+          result.push(key);
+        }
+        if (key === "extend") {
+          if (typeof o[key] === "string") {
+            result.push(o[key]);
+          } else if (Array.isArray(o[key])) {
+            result = result.concat(o[key]);
+          }
+        }
+        if (typeof o[key] === "object" && o[key] !== null) {
+          traverse(o[key]);
+        }
+      }
+    }
+  }
+  traverse(obj);
+  return result;
+};

package/dist/cjs/index.js

@@ -27,3 +27,4 @@ __reExport(utils_exports, require("./string.js"), module.exports);
 __reExport(utils_exports, require("./globals.js"), module.exports);
 __reExport(utils_exports, require("./cookie.js"), module.exports);
 __reExport(utils_exports, require("./tags.js"), module.exports);
+__reExport(utils_exports, require("./component.js"), module.exports);

package/dist/cjs/object.js

@@ -18,7 +18,6 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var object_exports = {};
 __export(object_exports, {
-  checkIfKeyIsComponent: () => checkIfKeyIsComponent,
   clone: () => clone,
   createNestedObject: () => createNestedObject,
   createObjectWithoutPrototype: () => createObjectWithoutPrototype,
@@ -37,8 +36,6 @@ __export(object_exports, {
   diffObjects: () => diffObjects,
   exec: () => exec,
   flattenRecursive: () => flattenRecursive,
-  getChildrenComponentsByKey: () => getChildrenComponentsByKey,
-  getExtendsInElement: () => getExtendsInElement,
   hasOwnProperty: () => hasOwnProperty,
   isEmpty: () => isEmpty,
   isEmptyObject: () => isEmptyObject,
@@ -62,7 +59,6 @@ var import_types = require("./types.js");
 var import_array = require("./array.js");
 var import_string = require("./string.js");
 var import_node = require("./node.js");
-var import_function = require("./function.js");
 const ENV = "development";
 const exec = (param, element, state, context) => {
   if ((0, import_types.isFunction)(param)) {
@@ -176,7 +172,7 @@ const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
     if ((0, import_types.isObjectLike)(objProp)) {
       o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
     } else if ((0, import_types.isFunction)(objProp) && options.window) {
-      o[prop] = (0, import_function.cloneFunction)(objProp, options.window);
+      o[prop] = (options.window || import_globals.window).eval("(" + objProp.toString() + ")");
     } else
       o[prop] = objProp;
   }
@@ -544,54 +540,6 @@ const createObjectWithoutPrototype = (obj) => {
   }
   return newObj;
 };
-const checkIfKeyIsComponent = (key) => {
-  const isFirstKeyString = (0, import_types.isString)(key);
-  if (!isFirstKeyString)
-    return;
-  const firstCharKey = key.slice(0, 1);
-  return /^[A-Z]*$/.test(firstCharKey);
-};
-const getChildrenComponentsByKey = (key, el) => {
-  if (key === el.key || el.__ref.__componentKey === key) {
-    return el;
-  }
-  if (el.extend) {
-    const foundString = (0, import_types.isString)(el.extend) && el.extend === key;
-    const foundInArray = (0, import_types.isArray)(el.extend) && el.extend.filter((v) => v === key).length;
-    if (foundString || foundInArray)
-      return el;
-  }
-  if (el.parent && el.parent.childExtend) {
-    const foundString = (0, import_types.isString)(el.parent.childExtend) && el.parent.childExtend === key;
-    const foundInArray = (0, import_types.isArray)(el.parent.childExtend) && el.parent.childExtend.filter((v) => v === key).length;
-    if (foundString || foundInArray)
-      return el;
-  }
-};
-const getExtendsInElement = (obj) => {
-  let result = [];
-  function traverse(o) {
-    for (const key in o) {
-      if (Object.hasOwnProperty.call(o, key)) {
-        if (checkIfKeyIsComponent(key)) {
-          result.push(key);
-        }
-        if (key === "extend") {
-          if (typeof o[key] === "string") {
-            result.push(o[key]);
-          } else if (Array.isArray(o[key])) {
-            result = result.concat(o[key]);
-          }
-        }
-        if (typeof o[key] === "object" && o[key] !== null) {
-          traverse(o[key]);
-        }
-      }
-    }
-  }
-  traverse(obj);
-  return result;
-};
 const createNestedObject = (arr, lastValue) => {
   const nestedObject = {};
   if (arr.length === 0) {

package/index.js

@@ -12,3 +12,4 @@ export * from './string.js'
 export * from './globals.js'
 export * from './cookie.js'
 export * from './tags.js'
+export * from './component.js'

package/object.js

@@ -15,7 +15,6 @@ import {
 import { mergeAndCloneIfArray, mergeArray } from './array.js'
 import { stringIncludesAny } from './string.js'
 import { isDOMNode } from './node.js'
-import { cloneFunction } from './function.js'
 
 const ENV = process.env.NODE_ENV
 
@@ -190,7 +189,7 @@ export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}) =
       o[prop] = deepCloneWithExtend(objProp, excludeFrom, options)
       // })
     } else if (isFunction(objProp) && options.window) {
-      o[prop] = cloneFunction(objProp, options.window)
+      o[prop] = (options.window || window).eval('(' + objProp.toString() + ')')
     } else o[prop] = objProp
   }
   return o
@@ -669,67 +668,6 @@ export const createObjectWithoutPrototype = (obj) => {
   return newObj
 }
 
-export const checkIfKeyIsComponent = (key) => {
-  const isFirstKeyString = isString(key)
-  if (!isFirstKeyString) return
-  const firstCharKey = key.slice(0, 1)
-  return /^[A-Z]*$/.test(firstCharKey)
-}
-
-export const getChildrenComponentsByKey = (key, el) => {
-  if (key === el.key || el.__ref.__componentKey === key) {
-    return el
-  }
-
-  // Check if the prop is "extend" and it's either a string or an array
-  if (el.extend) {
-    // Add the value of the extend key to the result array
-    const foundString = isString(el.extend) && el.extend === key
-    const foundInArray = isArray(el.extend) && el.extend.filter(v => v === key).length
-    if (foundString || foundInArray) return el
-  }
-
-  if (el.parent && el.parent.childExtend) {
-    // Add the value of the extend key to the result array
-    const foundString = isString(el.parent.childExtend) && el.parent.childExtend === key
-    const foundInArray = isArray(el.parent.childExtend) && el.parent.childExtend.filter(v => v === key).length
-    if (foundString || foundInArray) return el
-  }
-}
-
-export const getExtendsInElement = (obj) => {
-  let result = []
-
-  function traverse (o) {
-    for (const key in o) {
-      if (Object.hasOwnProperty.call(o, key)) {
-        // Check if the key starts with a capital letter and exclude keys like @mobileL, $propsCollection
-        if (checkIfKeyIsComponent(key)) {
-          result.push(key)
-        }
-
-        // Check if the key is "extend" and it's either a string or an array
-        if (key === 'extend') {
-          // Add the value of the extend key to the result array
-          if (typeof o[key] === 'string') {
-            result.push(o[key])
-          } else if (Array.isArray(o[key])) {
-            result = result.concat(o[key])
-          }
-        }
-
-        // If the property is an object, traverse it
-        if (typeof o[key] === 'object' && o[key] !== null) {
-          traverse(o[key])
-        }
-      }
-    }
-  }
-
-  traverse(obj)
-  return result
-}
-
 export const createNestedObject = (arr, lastValue) => {
   const nestedObject = {}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.125",
+  "version": "2.5.130",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -8,7 +8,9 @@
   "exports": {
     ".": {
       "kalduna": "./index.js",
-      "default": "./dist/cjs/index.js"
+      "default": "./dist/cjs/index.js",
+      "import": "./index.js",
+      "require": "./dist/cjs/index.js"
     }
   },
   "source": "index.js",
@@ -23,7 +25,7 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "20b6bab140fa7d75aaac85afa237cd906c60e89c",
+  "gitHead": "88815c621b7aeb9458c779643934c0d2e5305cd2",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }