@domql/utils 2.5.22 → 2.5.24

package/dist/cjs/object.js

@@ -32,7 +32,11 @@ __export(object_exports, {
   diffObjects: () => diffObjects,
   exec: () => exec,
   flattenRecursive: () => flattenRecursive,
+  hasOwnProperty: () => hasOwnProperty,
+  isEmpty: () => isEmpty,
+  isEmptyObject: () => isEmptyObject,
   isEqualDeep: () => isEqualDeep,
+  makeObjectWithoutPrototype: () => makeObjectWithoutPrototype,
   map: () => map,
   merge: () => merge,
   mergeArrayExclude: () => mergeArrayExclude,
@@ -49,7 +53,6 @@ var import_globals = require("./globals.js");
 var import_types = require("./types.js");
 var import_array = require("./array.js");
 var import_string = require("./string.js");
-var import_deep_object_diff = require("deep-object-diff");
 const exec = (param, element, state, context) => {
   if ((0, import_types.isFunction)(param)) {
     return param(
@@ -67,8 +70,8 @@ const map = (obj, extention, element) => {
 };
 const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, e);
-    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith("__"))
+    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, e);
+    if (!hasOwnProperty2 || excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const objProp = obj[e];
@@ -80,8 +83,8 @@ const merge = (element, obj, excludeFrom = []) => {
 };
 const deepMerge = (element, extend, excludeFrom = []) => {
   for (const e in extend) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty.call(extend, e);
-    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith("__"))
+    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(extend, e);
+    if (!hasOwnProperty2 || excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const extendProp = extend[e];
@@ -96,8 +99,8 @@ const deepMerge = (element, extend, excludeFrom = []) => {
 const clone = (obj, excludeFrom = []) => {
   const o = {};
   for (const prop in obj) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop);
-    if (!hasOwnProperty || excludeFrom.includes(prop) || prop.startsWith("__"))
+    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
+    if (!hasOwnProperty2 || excludeFrom.includes(prop) || prop.startsWith("__"))
       continue;
     o[prop] = obj[prop];
   }
@@ -109,8 +112,8 @@ const deepCloneExclude = (obj, excludeFrom = []) => {
   }
   const o = {};
   for (const k in obj) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, k);
-    if (!hasOwnProperty || excludeFrom.includes(k) || k.startsWith("__"))
+    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, k);
+    if (!hasOwnProperty2 || excludeFrom.includes(k) || k.startsWith("__"))
       continue;
     let v = obj[k];
     if (k === "extend" && (0, import_types.isArray)(v)) {
@@ -236,8 +239,8 @@ const detachFunctionsFromObject = (obj, detached = {}) => {
 };
 const deepDestringify = (obj, destringified = {}) => {
   for (const prop in obj) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop);
-    if (!hasOwnProperty)
+    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
+    if (!hasOwnProperty2)
       continue;
     const objProp = obj[prop];
     if ((0, import_types.isString)(objProp)) {
@@ -330,7 +333,39 @@ const diff = (original, objToDiff, cache = {}) => {
   }
   return cache;
 };
-const deepDiff = import_deep_object_diff.diff;
+const hasOwnProperty = (o, ...args) => Object.prototype.hasOwnProperty.call(o, ...args);
+const isEmpty = (o) => Object.keys(o).length === 0;
+const isEmptyObject = (o) => (0, import_types.isObject)(o) && isEmpty(o);
+const makeObjectWithoutPrototype = () => /* @__PURE__ */ Object.create(null);
+const deepDiff = (lhs, rhs) => {
+  if (lhs === rhs)
+    return {};
+  if (!(0, import_types.isObject)(lhs) || !(0, import_types.isObject)(rhs))
+    return rhs;
+  const deletedValues = Object.keys(lhs).reduce((acc, key) => {
+    if (!hasOwnProperty(rhs, key)) {
+      acc[key] = void 0;
+    }
+    return acc;
+  }, makeObjectWithoutPrototype());
+  if ((0, import_types.isDate)(lhs) || (0, import_types.isDate)(rhs)) {
+    if (lhs.valueOf() === rhs.valueOf())
+      return {};
+    return rhs;
+  }
+  return Object.keys(rhs).reduce((acc, key) => {
+    if (!hasOwnProperty(lhs, key)) {
+      acc[key] = rhs[key];
+      return acc;
+    }
+    const difference = diff(lhs[key], rhs[key]);
+    if (isEmptyObject(difference) && !(0, import_types.isDate)(difference) && (isEmptyObject(lhs[key]) || !isEmptyObject(rhs[key]))) {
+      return acc;
+    }
+    acc[key] = difference;
+    return acc;
+  }, deletedValues);
+};
 const overwrite = (element, params, excludeFrom = []) => {
   const { ref } = element;
   const changes = {};
@@ -426,8 +461,8 @@ const deepContains = (obj1, obj2) => {
       }
     } else if ((0, import_types.isObjectLike)(obj1) && obj2 !== null) {
       for (const key in obj1) {
-        const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj2, key);
-        if (!hasOwnProperty || !deepContains(obj1[key], obj2[key])) {
+        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj2, key);
+        if (!hasOwnProperty2 || !deepContains(obj1[key], obj2[key])) {
           return false;
         }
       }

package/dist/cjs/types.js

@@ -22,6 +22,7 @@ __export(types_exports, {
   is: () => is,
   isArray: () => isArray,
   isBoolean: () => isBoolean,
+  isDate: () => isDate,
   isDefined: () => isDefined,
   isFunction: () => isFunction,
   isNot: () => isNot,
@@ -45,13 +46,14 @@ const isFunction = (arg) => typeof arg === "function";
 const isBoolean = (arg) => arg === true || arg === false;
 const isNull = (arg) => arg === null;
 const isArray = (arg) => Array.isArray(arg);
+const isDate = (d) => d instanceof Date;
 const isObjectLike = (arg) => {
   if (arg === null)
     return false;
   return typeof arg === "object";
 };
 const isDefined = (arg) => {
-  return isObject(arg) || isObjectLike(arg) || isString(arg) || isNumber(arg) || isFunction(arg) || isArray(arg) || isObjectLike(arg) || isBoolean(arg) || isNull(arg);
+  return isObject(arg) || isObjectLike(arg) || isString(arg) || isNumber(arg) || isFunction(arg) || isArray(arg) || isObjectLike(arg) || isBoolean(arg) || isDate(arg) || isNull(arg);
 };
 const isUndefined = (arg) => {
   return arg === void 0;
@@ -61,6 +63,7 @@ const TYPES = {
   array: isArray,
   object: isObject,
   string: isString,
+  date: isDate,
   number: isNumber,
   null: isNull,
   function: isFunction,

package/object.js

@@ -1,10 +1,9 @@
 'use strict'
 
 import { window } from './globals.js'
-import { isFunction, isObjectLike, isObject, isArray, isString, is, isUndefined } from './types.js'
+import { isFunction, isObjectLike, isObject, isArray, isString, is, isUndefined, isDate } from './types.js'
 import { mergeAndCloneIfArray, mergeArray } from './array.js'
 import { stringIncludesAny } from './string.js'
-import { diff as deepObjectDiff } from 'deep-object-diff'
 
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
@@ -303,7 +302,50 @@ export const diff = (original, objToDiff, cache = {}) => {
   return cache
 }
 
-export const deepDiff = deepObjectDiff
+export const hasOwnProperty = (o, ...args) => Object.prototype.hasOwnProperty.call(o, ...args)
+
+export const isEmpty = o => Object.keys(o).length === 0
+
+export const isEmptyObject = (o) => isObject(o) && isEmpty(o)
+
+export const makeObjectWithoutPrototype = () => Object.create(null)
+
+// by mattphillips
+// https://github.com/mattphillips/deep-object-diff/blob/main/src/diff.js
+export const deepDiff = (lhs, rhs) => {
+  if (lhs === rhs) return {}
+
+  if (!isObject(lhs) || !isObject(rhs)) return rhs
+
+  const deletedValues = Object.keys(lhs).reduce((acc, key) => {
+    if (!hasOwnProperty(rhs, key)) {
+      acc[key] = undefined
+    }
+
+    return acc
+  }, makeObjectWithoutPrototype())
+
+  if (isDate(lhs) || isDate(rhs)) {
+    if (lhs.valueOf() === rhs.valueOf()) return {}
+    return rhs
+  }
+
+  return Object.keys(rhs).reduce((acc, key) => {
+    if (!hasOwnProperty(lhs, key)) {
+      acc[key] = rhs[key]
+      return acc
+    }
+
+    const difference = diff(lhs[key], rhs[key])
+
+    if (isEmptyObject(difference) && !isDate(difference) && (isEmptyObject(lhs[key]) || !isEmptyObject(rhs[key]))) {
+      return acc
+    }
+
+    acc[key] = difference
+    return acc
+  }, deletedValues)
+}
 
 /**
  * Overwrites object properties with another

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.22",
+  "version": "2.5.24",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,11 +23,8 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "231fe90e14adace5408e9f5def451463ec1430ae",
+  "gitHead": "95da8bcaf5250c1a6a339b7a5d11f49dd54a8369",
   "devDependencies": {
     "@babel/core": "^7.12.0"
-  },
-  "dependencies": {
-    "deep-object-diff": "^1.1.9"
   }
 }

package/types.js

@@ -19,6 +19,8 @@ export const isNull = arg => arg === null
 
 export const isArray = arg => Array.isArray(arg)
 
+export const isDate = d => d instanceof Date
+
 export const isObjectLike = arg => {
   if (arg === null) return false
   // if (isArray(arg)) return false
@@ -34,6 +36,7 @@ export const isDefined = arg => {
     isArray(arg) ||
     isObjectLike(arg) ||
     isBoolean(arg) ||
+    isDate(arg) ||
     isNull(arg)
 }
 
@@ -46,6 +49,7 @@ export const TYPES = {
   array: isArray,
   object: isObject,
   string: isString,
+  date: isDate,
   number: isNumber,
   null: isNull,
   function: isFunction,