@takeshape/util 8.256.0 → 8.260.1

package/dist/merge.d.ts

@@ -8,4 +8,6 @@ export declare function mergeWithArrayConcat<TObject, TSource>(object: TObject,
  * object path. Array items set to `null` will be removed.
  */
 export declare function mergeWithArrayMerge<TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+export declare function rebaseObject<T extends Record<string, unknown>>(to: T, base: T, from: T): T;
+export declare function rebaseArray(to: string[], base: string[], from: string[]): string[];
 //# sourceMappingURL=merge.d.ts.map

package/dist/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/merge.ts"],"names":[],"mappings":"AAeA;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,qBAEtF;AAWD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,qBAErF"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/merge.ts"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,qBAEtF;AAWD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,qBAErF;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAY1F;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAIlF"}

package/dist/merge.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mergeWithArrayConcat = mergeWithArrayConcat;
 exports.mergeWithArrayMerge = mergeWithArrayMerge;
+exports.rebaseArray = rebaseArray;
+exports.rebaseObject = rebaseObject;
 
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
 
@@ -14,6 +16,14 @@ var _merge = _interopRequireDefault(require("lodash/merge"));
 
 var _isNull = _interopRequireDefault(require("lodash/isNull"));
 
+var _difference = _interopRequireDefault(require("lodash/difference"));
+
+var _omit = _interopRequireDefault(require("lodash/omit"));
+
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
+var _union = _interopRequireDefault(require("lodash/union"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -51,4 +61,24 @@ const arrayMergeCustomizer = (value, srcValue) => {
 
 function mergeWithArrayMerge(object, source) {
   return (0, _mergeWith.default)(object, source, arrayMergeCustomizer);
+}
+
+function rebaseObject(to, base, from) {
+  const fromKeys = Object.keys(from);
+  const removedKeys = (0, _difference.default)(Object.keys(base), fromKeys);
+  const newObj = (0, _omit.default)(to, removedKeys);
+
+  for (const key of fromKeys) {
+    if (!(0, _isEqual.default)(base[key], from[key])) {
+      newObj[key] = from[key];
+    }
+  }
+
+  return newObj;
+}
+
+function rebaseArray(to, base, from) {
+  const removed = (0, _difference.default)(base, from);
+  const added = (0, _difference.default)(from, base);
+  return (0, _union.default)((0, _difference.default)(to, removed), added);
 }

package/es/merge.js

@@ -2,10 +2,14 @@ import isArray from 'lodash/isArray';
 import mergeWith from 'lodash/mergeWith';
 import merge from 'lodash/merge';
 import isNull from 'lodash/isNull';
-
+import difference from 'lodash/difference';
+import omit from 'lodash/omit';
+import isEqual from 'lodash/isEqual';
+import union from 'lodash/union';
 /**
  * Lodash `mergeWith` customizer to concat arrays
  */
+
 const arrayConcatCustomizer = (value, srcValue) => {
   if (isArray(value)) {
     return value.concat(srcValue);
@@ -37,4 +41,22 @@ const arrayMergeCustomizer = (value, srcValue) => {
 
 export function mergeWithArrayMerge(object, source) {
   return mergeWith(object, source, arrayMergeCustomizer);
+}
+export function rebaseObject(to, base, from) {
+  const fromKeys = Object.keys(from);
+  const removedKeys = difference(Object.keys(base), fromKeys);
+  const newObj = omit(to, removedKeys);
+
+  for (const key of fromKeys) {
+    if (!isEqual(base[key], from[key])) {
+      newObj[key] = from[key];
+    }
+  }
+
+  return newObj;
+}
+export function rebaseArray(to, base, from) {
+  const removed = difference(base, from);
+  const added = difference(from, base);
+  return union(difference(to, removed), added);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/util",
-  "version": "8.256.0",
+  "version": "8.260.1",
   "description": "Shared utilities",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -33,7 +33,7 @@
     "prismjs": "^1.25.0",
     "shortid": "^2.2.16",
     "url-parse": "^1.5.3",
-    "@takeshape/routing": "8.256.0"
+    "@takeshape/routing": "8.260.1"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.9",