patch(n4s): simplify gte and lte rules

ealush · Mar 20, 2022 · 414673a · 414673a
1 parent cdf6910
commit 414673a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/n4s/src/rules/greaterThanOrEquals.ts b/packages/n4s/src/rules/greaterThanOrEquals.ts
@@ -1,8 +1,9 @@
-import { isNumeric } from 'isNumeric';
+import { greaterThan } from 'greaterThan';
+import { numberEquals } from 'numberEquals';
 
 export function greaterThanOrEquals(
   value: string | number,
   gte: string | number
 ): boolean {
-  return isNumeric(value) && isNumeric(gte) && Number(value) >= Number(gte);
+  return numberEquals(value, gte) || greaterThan(value, gte);
 }
diff --git a/packages/n4s/src/rules/lessThanOrEquals.ts b/packages/n4s/src/rules/lessThanOrEquals.ts
@@ -1,8 +1,9 @@
-import { isNumeric } from 'isNumeric';
+import { lessThan } from 'lessThan';
+import { numberEquals } from 'numberEquals';
 
 export function lessThanOrEquals(
   value: string | number,
   lte: string | number
 ): boolean {
-  return isNumeric(value) && isNumeric(lte) && Number(value) <= Number(lte);
+  return numberEquals(value, lte) || lessThan(value, lte);
 }