Merge pull request crcn#259 from crcn/fix-255

Fix 255

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sift",
   "description": "MongoDB query filtering in JavaScript",
-  "version": "17.0.0",
+  "version": "17.0.1",
   "repository": "crcn/sift.js",
   "sideEffects": false,
   "author": {

src/core.ts

@@ -4,7 +4,8 @@ import {
   Comparator,
   isVanillaObject,
   comparable,
-  equals
+  equals,
+  coercePotentiallyNull
 } from "./utils";
 
 export interface Operation<TItem> {
@@ -294,21 +295,9 @@ export const createEqualsOperation = (
   options: Options
 ) => new EqualsOperation(params, owneryQuery, options);
 
-export class NopeOperation<TParam> extends BaseOperation<TParam> {
-  readonly propop = true;
-  next(item) {
-    this.done = true;
-    this.keep = item == null;
-  }
-}
-
 export const numericalOperationCreator = (
   createNumericalOperation: OperationCreator<any>
 ) => (params: any, owneryQuery: any, options: Options, name: string) => {
-  if (params == null) {
-    return new NopeOperation(params, owneryQuery, options, name);
-  }
-
   return createNumericalOperation(params, owneryQuery, options, name);
 };
 
@@ -319,7 +308,10 @@ export const numericalOperation = (createTester: (any) => Tester) =>
       const test = createTester(params);
       return new EqualsOperation(
         b => {
-          return typeof comparable(b) === typeofParams && test(b);
+          const actualValue = coercePotentiallyNull(b);
+          return (
+            typeof comparable(actualValue) === typeofParams && test(actualValue)
+          );
         },
         owneryQuery,
         options,

src/operations.ts

@@ -10,8 +10,7 @@ import {
   Query,
   NamedGroupOperation,
   numericalOperation,
-  containsOperation,
-  NamedOperation
+  containsOperation
 } from "./core";
 import { Key, comparable, isFunction, isArray } from "./utils";
 
@@ -305,10 +304,18 @@ export const $in = (
   return new $In(params, owneryQuery, options, name);
 };
 
-export const $lt = numericalOperation(params => b => b < params);
-export const $lte = numericalOperation(params => b => b <= params);
-export const $gt = numericalOperation(params => b => b > params);
-export const $gte = numericalOperation(params => b => b >= params);
+export const $lt = numericalOperation(params => b => {
+  return b != null && b < params;
+});
+export const $lte = numericalOperation(params => b => {
+  return b === params || b <= params;
+});
+export const $gt = numericalOperation(params => b => {
+  return b != null && b > params;
+});
+export const $gte = numericalOperation(params => b => {
+  return b === params || b >= params;
+});
 export const $mod = (
   [mod, equalsValue]: number[],
   owneryQuery: Query<any>,

src/utils.ts

@@ -21,6 +21,9 @@ export const comparable = (value: any) => {
   return value;
 };
 
+export const coercePotentiallyNull = (value: any) =>
+  value == null ? null : value;
+
 export const isArray = typeChecker<Array<any>>("Array");
 export const isObject = typeChecker<Object>("Object");
 export const isFunction = typeChecker<Function>("Function");

test/operations-test.js

@@ -191,6 +191,12 @@ describe(__filename + "#", function() {
     [{ $lte: "5" }, [4, 3, 2, 1], [], false],
     [{ $lte: "5" }, ["4", "3", "2"], ["4", "3", "2"], false],
     [{ ab: { $lte: null } }, [{ ab: 5 }, { cd: 5 }], [{ cd: 5 }], false],
+    [
+      { ab: { $lte: "blue" } },
+      [{ ab: "blue" }, { cd: 5 }],
+      [{ ab: "blue" }],
+      false
+    ],
     [
       { groups: { $lt: 5 } },
       [{ groups: [1, 2, 3, 4] }, { groups: [7, 8] }],
@@ -212,6 +218,13 @@ describe(__filename + "#", function() {
     // $gte
     [{ $gte: 5 }, [3, 4, 5, 6], [5, 6], false],
     [{ $gte: "5" }, [4, 3, 2, 1], [], false],
+    [{ ab: { $gte: null } }, [{ ab: 5 }, { cd: 5 }], [{ cd: 5 }], false],
+    [
+      { ab: { $gte: "blue" } },
+      [{ ab: "blue" }, { cd: 5 }],
+      [{ ab: "blue" }],
+      false
+    ],
     [
       { groups: { $gte: 5 } },
       [{ groups: [1, 2, 3, 4] }, { groups: [7, 8] }],