@domql/utils 2.3.137 → 2.3.141

package/array.js

@@ -43,3 +43,39 @@ export const mergeArray = (arr, excludeFrom = []) => {
 export const mergeAndCloneIfArray = obj => {
   return isArray(obj) ? mergeArray(obj) : deepClone(obj)
 }
+
+export const cutArrayBeforeValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(0, index);
+  }
+  return arr;
+}
+
+export const cutArrayAfterValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(index + 1);
+  }
+  return arr;
+}
+
+export const createNestedObject = (arr, lastValue) => {
+  let nestedObject = {};
+
+  if (arr.length === 0) {
+    return lastValue;
+  }
+
+  arr.reduce((obj, value, index) => {
+    if (!obj[value]) {
+      obj[value] = {};
+    }
+    if (index === arr.length - 1 && lastValue) {
+      obj[value] = lastValue;
+    }
+    return obj[value];
+  }, nestedObject);
+
+  return nestedObject;
+}

package/dist/cjs/array.js

@@ -19,6 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var array_exports = {};
 __export(array_exports, {
   arrayContainsOtherArray: () => arrayContainsOtherArray,
+  createNestedObject: () => createNestedObject,
+  cutArrayAfterValue: () => cutArrayAfterValue,
+  cutArrayBeforeValue: () => cutArrayBeforeValue,
   joinArrays: () => joinArrays,
   mergeAndCloneIfArray: () => mergeAndCloneIfArray,
   mergeArray: () => mergeArray,
@@ -58,3 +61,33 @@ const mergeArray = (arr, excludeFrom = []) => {
 const mergeAndCloneIfArray = (obj) => {
   return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
 };
+const cutArrayBeforeValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(0, index);
+  }
+  return arr;
+};
+const cutArrayAfterValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(index + 1);
+  }
+  return arr;
+};
+const createNestedObject = (arr, lastValue) => {
+  let nestedObject = {};
+  if (arr.length === 0) {
+    return lastValue;
+  }
+  arr.reduce((obj, value, index) => {
+    if (!obj[value]) {
+      obj[value] = {};
+    }
+    if (index === arr.length - 1 && lastValue) {
+      obj[value] = lastValue;
+    }
+    return obj[value];
+  }, nestedObject);
+  return nestedObject;
+};

package/dist/cjs/object.js

@@ -167,13 +167,28 @@ const objectToString = (obj, indent = 0) => {
   const spaces = "  ".repeat(indent);
   let str = "{\n";
   for (const [key, value] of Object.entries(obj)) {
-    const keyAllowdChars = (0, import_string.stringIncludesAny)(key, ["-", ":"]);
+    const keyAllowdChars = (0, import_string.stringIncludesAny)(key, ["-", ":", "@", ".", "!"]);
     const stringedKey = keyAllowdChars ? `'${key}'` : key;
     str += `${spaces}  ${stringedKey}: `;
-    if (typeof value === "object" && value !== null) {
+    if ((0, import_types.isArray)(value)) {
+      str += "[\n";
+      for (const element of value) {
+        if ((0, import_types.isObject)(element) && element !== null) {
+          str += `${spaces}    ${objectToString(element, indent + 2)},
+`;
+        } else if ((0, import_types.isString)(element)) {
+          str += `${spaces}    '${element}',
+`;
+        } else {
+          str += `${spaces}    ${element},
+`;
+        }
+      }
+      str += `${spaces}  ]`;
+    } else if ((0, import_types.isObject)(value)) {
       str += objectToString(value, indent + 1);
-    } else if (typeof value === "string") {
-      str += `'${value}'`;
+    } else if ((0, import_types.isString)(value)) {
+      str += (0, import_string.stringIncludesAny)(value, ["\n", "'"]) ? `\`${value}\`` : `'${value}'`;
     } else {
       str += value;
     }

package/object.js

@@ -141,14 +141,26 @@ export const objectToString = (obj, indent = 0) => {
   let str = '{\n'
 
   for (const [key, value] of Object.entries(obj)) {
-    const keyAllowdChars = stringIncludesAny(key, ['-', ':'])
+    const keyAllowdChars = stringIncludesAny(key, ['-', ':', '@', '.', '!'])
     const stringedKey = keyAllowdChars ? `'${key}'` : key
     str += `${spaces}  ${stringedKey}: `
 
-    if (typeof value === 'object' && value !== null) {
+    if (isArray(value)) {
+      str += '[\n'
+      for (const element of value) {
+        if (isObject(element) && element !== null) {
+          str += `${spaces}    ${objectToString(element, indent + 2)},\n`
+        } else if (isString(element)) {
+          str += `${spaces}    '${element}',\n`
+        } else {
+          str += `${spaces}    ${element},\n`
+        }
+      }
+      str += `${spaces}  ]`
+    } else if (isObject(value)) {
       str += objectToString(value, indent + 1)
-    } else if (typeof value === 'string') {
-      str += `'${value}'`
+    } else if (isString(value)) {
+      str += stringIncludesAny(value, ['\n', '\'']) ? `\`${value}\`` : `'${value}'`
     } else {
       str += value
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.137",
+  "version": "2.3.141",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,7 +23,7 @@
     "@domql/key": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "07ca3db13100667ebe3915db37a18b6e694a3ce3",
+  "gitHead": "ba9451d23df608f67ee1fd24de442cd558387202",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }