Merge 2a569fb into 43e5478

dynamoose · Mar 15, 2021 · 385e651 · 385e651
2 parents 43e5478 + 2a569fb
commit 385e651
Show file tree

Hide file tree

Showing 23 changed files with 5 additions and 565 deletions.
diff --git a/lib/utils/dynamoose/index_changes.ts b/lib/utils/dynamoose/index_changes.ts
@@ -1,4 +1,4 @@
-import obj = require("../object");
+import obj = require("js-object-utilities");
 import {Model} from "../../Model";
 import {Document} from "../../Document";
 import {IndexItem} from "../../Schema";

diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -6,7 +6,7 @@ import set_immediate_promise = require("./set_immediate_promise");
 import unique_array_elements = require("./unique_array_elements");
 import array_flatten = require("./array_flatten");
 import empty_function = require("./empty_function");
-import object = require("./object");
+import object = require("js-object-utilities");
 import dynamoose = require("./dynamoose");
 import all_elements_match from "./all_elements_match";
 import type_name from "./type_name";

diff --git a/lib/utils/merge_objects.ts b/lib/utils/merge_objects.ts
@@ -10,7 +10,7 @@ interface MergeObjectsSettings {
 	combineMethod: MergeObjectsCombineMethod;
 }
 
-import {GeneralObject} from "./object/types";
+type GeneralObject<T> = { [key: string]: T };
 
 const main = (settings: MergeObjectsSettings = {"combineMethod": MergeObjectsCombineMethod.ArrayMerge}) => <T>(...args: GeneralObject<T>[]): GeneralObject<T> => {
 	let returnObject: { [x: string]: any };

diff --git a/lib/utils/object/clear_empties.ts b/lib/utils/object/clear_empties.ts
diff --git a/lib/utils/object/delete.ts b/lib/utils/object/delete.ts
diff --git a/lib/utils/object/entries.ts b/lib/utils/object/entries.ts
diff --git a/lib/utils/object/equals.ts b/lib/utils/object/equals.ts
diff --git a/lib/utils/object/get.ts b/lib/utils/object/get.ts
diff --git a/lib/utils/object/index.ts b/lib/utils/object/index.ts
diff --git a/lib/utils/object/keys.ts b/lib/utils/object/keys.ts
diff --git a/lib/utils/object/pick.ts b/lib/utils/object/pick.ts
diff --git a/lib/utils/object/set.ts b/lib/utils/object/set.ts
diff --git a/lib/utils/object/types.ts b/lib/utils/object/types.ts
diff --git a/lib/utils/unique_array_elements.ts b/lib/utils/unique_array_elements.ts
@@ -1,3 +1,3 @@
-import obj = require("./object");
+import obj = require("js-object-utilities");
 
 export = <T>(array: T[]): T[] => array.filter((value, index, self) => self.findIndex((searchVal) => obj.equals(searchVal, value)) === index);
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
   },
   "dependencies": {
     "aws-sdk": "^2.792.0",
+    "js-object-utilities": "^1.0.0",
     "source-map-support": "^0.5.19",
     "uuid": "^8.3.1"
   },

diff --git a/test/unit/utils/object/clear_empties.js b/test/unit/utils/object/clear_empties.js
diff --git a/test/unit/utils/object/delete.js b/test/unit/utils/object/delete.js
diff --git a/test/unit/utils/object/entries.js b/test/unit/utils/object/entries.js