@domql/utils 2.5.162 → 2.5.167

package/array.js

@@ -135,3 +135,8 @@ export const filterArraysFast = (sourceArr, excludeArr) => {
   const excludeSet = new Set(excludeArr)
   return sourceArr.filter(item => !excludeSet.has(item))
 }
+
+export const checkIfStringIsInArray = (string, arr) => {
+  if (!string) return
+  return arr.filter(v => string.includes(v)).length
+}

package/component.js

@@ -56,19 +56,21 @@ export const checkIfSugar = (element, parent, key) => {
   return !hasComponentAttrs || childProps || extendProps || children || childExtends
 }
 
-export const extendizeByKey = (element, parent, key) => {
-  const { context } = parent
-  const { tag, extend, childExtends } = element
-  const isSugar = checkIfSugar(element, parent, key)
-
-  const extendFromKey = key.includes('+')
+export const extractComponentKeyFromKey = (key) => {
+  return 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]
+}
 
+export const extendizeByKey = (element, parent, key) => {
+  const { context } = parent
+  const { tag, extend, childExtends } = element
+  const isSugar = checkIfSugar(element, parent, key)
+  const extendFromKey = extractComponentKeyFromKey(key)
   const isExtendKeyComponent = context && context.components[extendFromKey]
   if (element === isExtendKeyComponent) return element
   else if (isSugar) {
@@ -198,7 +200,7 @@ export const getExtendsInElement = (obj) => {
         }
 
         // Check if the key is "extend" and it's either a string or an array
-        if (key === 'extend') {
+        if (key === 'extend' || key === 'extends') {
           // Add the value of the extend key to the result array
           if (typeof o[key] === 'string') {
             result.push(o[key])

package/dist/cjs/array.js

@@ -21,6 +21,7 @@ __export(array_exports, {
   addItemAfterEveryElement: () => addItemAfterEveryElement,
   arrayContainsOtherArray: () => arrayContainsOtherArray,
   arraysEqual: () => arraysEqual,
+  checkIfStringIsInArray: () => checkIfStringIsInArray,
   cutArrayAfterValue: () => cutArrayAfterValue,
   cutArrayBeforeValue: () => cutArrayBeforeValue,
   filterArrays: () => filterArrays,
@@ -140,3 +141,8 @@ const filterArraysFast = (sourceArr, excludeArr) => {
   const excludeSet = new Set(excludeArr);
   return sourceArr.filter((item) => !excludeSet.has(item));
 };
+const checkIfStringIsInArray = (string, arr) => {
+  if (!string)
+    return;
+  return arr.filter((v) => string.includes(v)).length;
+};

package/dist/cjs/component.js

@@ -26,6 +26,7 @@ __export(component_exports, {
   checkIfKeyIsProperty: () => checkIfKeyIsProperty,
   checkIfSugar: () => checkIfSugar,
   extendizeByKey: () => extendizeByKey,
+  extractComponentKeyFromKey: () => extractComponentKeyFromKey,
   getCapitalCaseKeys: () => getCapitalCaseKeys,
   getChildrenComponentsByKey: () => getChildrenComponentsByKey,
   getExtendsInElement: () => getExtendsInElement,
@@ -82,11 +83,14 @@ const checkIfSugar = (element, parent, key) => {
   }
   return !hasComponentAttrs || childProps || extendProps || children || childExtends;
 };
+const extractComponentKeyFromKey = (key) => {
+  return key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
+};
 const extendizeByKey = (element, parent, key) => {
   const { context } = parent;
   const { tag, extend, childExtends } = 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 extendFromKey = extractComponentKeyFromKey(key);
   const isExtendKeyComponent = context && context.components[extendFromKey];
   if (element === isExtendKeyComponent)
     return element;
@@ -206,7 +210,7 @@ const getExtendsInElement = (obj) => {
         if (checkIfKeyIsComponent(key)) {
           result.push(key);
         }
-        if (key === "extend") {
+        if (key === "extend" || key === "extends") {
           if (typeof o[key] === "string") {
             result.push(o[key]);
           } else if (Array.isArray(o[key])) {

package/dist/esm/array.js

@@ -102,10 +102,16 @@ const filterArraysFast = (sourceArr, excludeArr) => {
   const excludeSet = new Set(excludeArr);
   return sourceArr.filter((item) => !excludeSet.has(item));
 };
+const checkIfStringIsInArray = (string, arr) => {
+  if (!string)
+    return;
+  return arr.filter((v) => string.includes(v)).length;
+};
 export {
   addItemAfterEveryElement,
   arrayContainsOtherArray,
   arraysEqual,
+  checkIfStringIsInArray,
   cutArrayAfterValue,
   cutArrayBeforeValue,
   filterArrays,

package/dist/esm/component.js

@@ -73,11 +73,14 @@ const checkIfSugar = (element, parent, key) => {
   }
   return !hasComponentAttrs || childProps || extendProps || children || childExtends;
 };
+const extractComponentKeyFromKey = (key) => {
+  return key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
+};
 const extendizeByKey = (element, parent, key) => {
   const { context } = parent;
   const { tag, extend, childExtends } = 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 extendFromKey = extractComponentKeyFromKey(key);
   const isExtendKeyComponent = context && context.components[extendFromKey];
   if (element === isExtendKeyComponent)
     return element;
@@ -196,7 +199,7 @@ const getExtendsInElement = (obj) => {
         if (checkIfKeyIsComponent(key)) {
           result.push(key);
         }
-        if (key === "extend") {
+        if (key === "extend" || key === "extends") {
           if (typeof o[key] === "string") {
             result.push(o[key]);
           } else if (Array.isArray(o[key])) {
@@ -232,6 +235,7 @@ export {
   checkIfKeyIsProperty,
   checkIfSugar,
   extendizeByKey,
+  extractComponentKeyFromKey,
   getCapitalCaseKeys,
   getChildrenComponentsByKey,
   getExtendsInElement,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.162",
+  "version": "2.5.167",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -25,7 +25,7 @@
     "build": "npm run build:cjs; npm run build:esm",
     "prepublish": "rimraf -I dist; npm run build; npm run copy:package:cjs"
   },
-  "gitHead": "0aeb25f284d863a57821a0a74937c2b9babb7969",
+  "gitHead": "3851b6d1029397dcf61c44682be5b9c234993e74",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }