@domql/utils 2.3.125 → 2.3.137

package/dist/cjs/index.js

@@ -22,3 +22,4 @@ __reExport(utils_exports, require("./function.js"), module.exports);
 __reExport(utils_exports, require("./array.js"), module.exports);
 __reExport(utils_exports, require("./node.js"), module.exports);
 __reExport(utils_exports, require("./log.js"), module.exports);
+__reExport(utils_exports, require("./string.js"), module.exports);

package/dist/cjs/object.js

@@ -35,16 +35,18 @@ __export(object_exports, {
   merge: () => merge,
   mergeArrayExclude: () => mergeArrayExclude,
   mergeIfExisted: () => mergeIfExisted,
+  objectToString: () => objectToString,
   overwrite: () => overwrite,
   overwriteDeep: () => overwriteDeep,
-  overwriteObj: () => overwriteObj,
   overwriteShallow: () => overwriteShallow,
-  removeFromObject: () => removeFromObject
+  removeFromObject: () => removeFromObject,
+  stringToObject: () => stringToObject
 });
 module.exports = __toCommonJS(object_exports);
 var import_globals = require("@domql/globals");
 var import_types = require("./types.js");
 var import_array = require("./array.js");
+var import_string = require("./string.js");
 const exec = (param, element, state, context) => {
   if ((0, import_types.isFunction)(param)) {
     return param(
@@ -161,6 +163,25 @@ const deepStringify = (obj, stringified = {}) => {
   }
   return stringified;
 };
+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 stringedKey = keyAllowdChars ? `'${key}'` : key;
+    str += `${spaces}  ${stringedKey}: `;
+    if (typeof value === "object" && value !== null) {
+      str += objectToString(value, indent + 1);
+    } else if (typeof value === "string") {
+      str += `'${value}'`;
+    } else {
+      str += value;
+    }
+    str += ",\n";
+  }
+  str += `${spaces}}`;
+  return str;
+};
 const detachFunctionsFromObject = (obj, detached = {}) => {
   for (const prop in obj) {
     const objProp = obj[prop];
@@ -231,20 +252,15 @@ const deepDestringify = (obj, stringified = {}) => {
   }
   return stringified;
 };
-const overwrite = (element, params, excludeFrom = []) => {
-  const { ref } = element;
-  const changes = {};
-  for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes("__"))
-      continue;
-    const elementProp = element[e];
-    const paramsProp = params[e];
-    if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp;
-      ref[e] = paramsProp;
-    }
+const stringToObject = (str) => {
+  let obj;
+  try {
+    obj = import_globals.window.eval("(" + str + ")");
+  } catch (e) {
+    console.warn(e);
   }
-  return changes;
+  if (obj)
+    return obj;
 };
 const diffObjects = (original, objToDiff, cache) => {
   for (const e in objToDiff) {
@@ -287,13 +303,17 @@ const diff = (original, objToDiff, cache = {}) => {
   }
   return cache;
 };
-const overwriteObj = (params, obj) => {
+const overwrite = (element, params, excludeFrom = []) => {
+  const { ref } = element;
   const changes = {};
   for (const e in params) {
-    const objProp = obj[e];
+    if (excludeFrom.includes(e) || e.includes("__"))
+      continue;
+    const elementProp = element[e];
     const paramsProp = params[e];
     if (paramsProp) {
-      obj[e] = changes[e] = objProp;
+      ref.__cache[e] = changes[e] = elementProp;
+      ref[e] = paramsProp;
     }
   }
   return changes;

package/dist/cjs/string.js

@@ -0,0 +1,31 @@
+"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 string_exports = {};
+__export(string_exports, {
+  stringIncludesAny: () => stringIncludesAny
+});
+module.exports = __toCommonJS(string_exports);
+const stringIncludesAny = (str, characters) => {
+  for (const char of characters) {
+    if (str.includes(char)) {
+      return true;
+    }
+  }
+  return false;
+};

package/index.js

@@ -7,3 +7,4 @@ export * from './function.js'
 export * from './array.js'
 export * from './node.js'
 export * from './log.js'
+export * from './string.js'

package/object.js

@@ -3,6 +3,7 @@
 import { window } from '@domql/globals'
 import { isFunction, isObjectLike, isObject, isArray, isString, is } from './types.js'
 import { mergeAndCloneIfArray, mergeArray } from './array.js'
+import { stringIncludesAny } from './string.js'
 
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
@@ -135,6 +136,30 @@ export const deepStringify = (obj, stringified = {}) => {
   return stringified
 }
 
+export const objectToString = (obj, indent = 0) => {
+  const spaces = '  '.repeat(indent)
+  let str = '{\n'
+
+  for (const [key, value] of Object.entries(obj)) {
+    const keyAllowdChars = stringIncludesAny(key, ['-', ':'])
+    const stringedKey = keyAllowdChars ? `'${key}'` : key
+    str += `${spaces}  ${stringedKey}: `
+
+    if (typeof value === 'object' && value !== null) {
+      str += objectToString(value, indent + 1)
+    } else if (typeof value === 'string') {
+      str += `'${value}'`
+    } else {
+      str += value
+    }
+
+    str += ',\n'
+  }
+
+  str += `${spaces}}`
+  return str
+}
+
 /**
  * Stringify object
  */
@@ -205,26 +230,13 @@ export const deepDestringify = (obj, stringified = {}) => {
   return stringified
 }
 
-/**
- * Overwrites object properties with another
- */
-export const overwrite = (element, params, excludeFrom = []) => {
-  const { ref } = element
-  const changes = {}
-
-  for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
-
-    const elementProp = element[e]
-    const paramsProp = params[e]
-
-    if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp
-      ref[e] = paramsProp
-    }
-  }
+export const stringToObject = (str) => {
+  let obj
+  try {
+    obj = window.eval('(' + str + ')') // eslint-disable-line
+  } catch (e) { console.warn(e) }
 
-  return changes
+  if (obj) return obj
 }
 
 export const diffObjects = (original, objToDiff, cache) => {
@@ -276,15 +288,19 @@ export const diff = (original, objToDiff, cache = {}) => {
 /**
  * Overwrites object properties with another
  */
-export const overwriteObj = (params, obj) => {
+export const overwrite = (element, params, excludeFrom = []) => {
+  const { ref } = element
   const changes = {}
 
   for (const e in params) {
-    const objProp = obj[e]
+    if (excludeFrom.includes(e) || e.includes('__')) continue
+
+    const elementProp = element[e]
     const paramsProp = params[e]
 
     if (paramsProp) {
-      obj[e] = changes[e] = objProp
+      ref.__cache[e] = changes[e] = elementProp
+      ref[e] = paramsProp
     }
   }
 

package/package.json

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

package/string.js

@@ -0,0 +1,10 @@
+'use strict'
+
+export const stringIncludesAny = (str, characters) => {
+  for (const char of characters) {
+    if (str.includes(char)) {
+      return true;
+    }
+  }
+  return false;
+}