From 9b9e39429ded0c2d96c4ac9c84e3d2bc96582235 Mon Sep 17 00:00:00 2001 From: ealush Date: Fri, 25 Mar 2022 14:28:08 +0300 Subject: [PATCH] patch(n4s): use number rules in length rules --- packages/n4s/src/rules/lengthEquals.ts | 4 +++- packages/n4s/src/rules/longerThan.ts | 4 +++- packages/n4s/src/rules/longerThanOrEquals.ts | 4 +++- packages/n4s/src/rules/shorterThan.ts | 4 +++- packages/n4s/src/rules/shorterThanOrEquals.ts | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/n4s/src/rules/lengthEquals.ts b/packages/n4s/src/rules/lengthEquals.ts index 60edf207e..f4babe02a 100644 --- a/packages/n4s/src/rules/lengthEquals.ts +++ b/packages/n4s/src/rules/lengthEquals.ts @@ -1,10 +1,12 @@ import bindNot from 'bindNot'; +import { numberEquals } from 'numberEquals'; + export function lengthEquals( value: string | unknown[], arg1: string | number ): boolean { - return value.length === Number(arg1); + return numberEquals(value.length, arg1); } export const lengthNotEquals = bindNot(lengthEquals); diff --git a/packages/n4s/src/rules/longerThan.ts b/packages/n4s/src/rules/longerThan.ts index df8142153..1bbeef245 100644 --- a/packages/n4s/src/rules/longerThan.ts +++ b/packages/n4s/src/rules/longerThan.ts @@ -1,6 +1,8 @@ +import { greaterThan } from 'greaterThan'; + export function longerThan( value: string | unknown[], arg1: string | number ): boolean { - return value.length > Number(arg1); + return greaterThan(value.length, arg1); } diff --git a/packages/n4s/src/rules/longerThanOrEquals.ts b/packages/n4s/src/rules/longerThanOrEquals.ts index bcf60c25e..7a1e8dec3 100644 --- a/packages/n4s/src/rules/longerThanOrEquals.ts +++ b/packages/n4s/src/rules/longerThanOrEquals.ts @@ -1,6 +1,8 @@ +import { greaterThanOrEquals } from 'greaterThanOrEquals'; + export function longerThanOrEquals( value: string | unknown[], arg1: string | number ): boolean { - return value.length >= Number(arg1); + return greaterThanOrEquals(value.length, arg1); } diff --git a/packages/n4s/src/rules/shorterThan.ts b/packages/n4s/src/rules/shorterThan.ts index 5ae0b8cbc..6e1169ca1 100644 --- a/packages/n4s/src/rules/shorterThan.ts +++ b/packages/n4s/src/rules/shorterThan.ts @@ -1,6 +1,8 @@ +import { lessThan } from 'lessThan'; + export function shorterThan( value: string | unknown[], arg1: string | number ): boolean { - return value.length < Number(arg1); + return lessThan(value.length, arg1); } diff --git a/packages/n4s/src/rules/shorterThanOrEquals.ts b/packages/n4s/src/rules/shorterThanOrEquals.ts index 50142c013..93a89ad90 100644 --- a/packages/n4s/src/rules/shorterThanOrEquals.ts +++ b/packages/n4s/src/rules/shorterThanOrEquals.ts @@ -1,6 +1,8 @@ +import { lessThanOrEquals } from 'lessThanOrEquals'; + export function shorterThanOrEquals( value: string | unknown[], arg1: string | number ): boolean { - return value.length <= Number(arg1); + return lessThanOrEquals(value.length, arg1); }