fix(conditions): moves logic related to compare complex types to @uca…

…st/mongo2js
stalniy · Aug 11, 2020 · 9bd6a1b · 9bd6a1b
1 parent 177966d
commit 9bd6a1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/packages/casl-ability/package.json b/packages/casl-ability/package.json
@@ -76,6 +76,6 @@
     "extra"
   ],
   "dependencies": {
-    "@ucast/mongo2js": "^1.0.0"
+    "@ucast/mongo2js": "^1.1.1"
   }
 }
diff --git a/packages/casl-ability/src/matchers/conditions.ts b/packages/casl-ability/src/matchers/conditions.ts
@@ -26,8 +26,6 @@ import {
   $exists,
   exists,
   createFactory,
-  equal,
-  createGetter
 } from '@ucast/mongo2js';
 import type { MongoQuery } from '@ucast/mongo2js';
 import { ConditionsMatcher } from '../types';
@@ -63,32 +61,13 @@ const defaultInterpreters = {
   exists,
 };
 
-interface HasToJSON {
-  toJSON(): unknown
-}
-
-function toPrimitive(value: unknown) {
-  if (value instanceof Date) {
-    return value.getTime();
-  }
-
-  if (value && typeof (value as HasToJSON).toJSON === 'function') {
-    return (value as HasToJSON).toJSON();
-  }
-
-  return value;
-}
-
-const isEqual: typeof equal = (a, b) => equal(toPrimitive(a), toPrimitive(b));
-const getField = createGetter((object, field) => toPrimitive(object[field]));
-
 type MongoQueryMatcher =
   (...args: Partial<Parameters<typeof createFactory>>) => ConditionsMatcher<MongoQuery>;
 export const buildMongoQueryMatcher: MongoQueryMatcher = (instructions, interpreters, options) => {
   return createFactory(
     { ...defaultInstructions, ...instructions },
     { ...defaultInterpreters, ...interpreters },
-    { equal: isEqual, get: getField, ...options }
+    options
   );
 };