feat: accept int in isOnlyDigits

mll-lab · Dec 8, 2023 · 7d35896 · 7d35896
1 parent 8517970
commit 7d35896
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/predicates.test.ts b/src/predicates.test.ts
@@ -1,5 +1,9 @@
-import { isLabId, isRackBarcode, PredicateFn } from './predicates';
-import { isNotNullish } from './typeGuards';
+import {
+  isLabId,
+  isOnlyDigits,
+  isRackBarcode,
+  PredicateFn,
+} from './predicates';
 
 export function assertFalse(
   predicate: PredicateFn,
@@ -25,13 +29,13 @@ describe('predicates', () => {
     assertFalse(isLabId, ['asdf', '12345678', '123123123123']);
   });
 
+  describe('isOnlyDigits', () => {
+    assertTrue(isOnlyDigits, ['123', 123]);
+    assertFalse(isOnlyDigits, ['12x', 'x12', '1,2', '1.2', 1.2]);
+  });
+
   describe('isRackBarcode', () => {
     assertTrue(isRackBarcode, ['FE12345678']);
     assertFalse(isRackBarcode, ['FE123456789', 'fe12345678', '12345678']);
   });
-
-  describe('isNotNullish', () => {
-    assertTrue(isNotNullish, ['', [], {}, false]);
-    assertFalse(isNotNullish, [null, undefined]);
-  });
 });
diff --git a/src/predicates.ts b/src/predicates.ts
@@ -29,10 +29,20 @@ export const isEmail: PredicateFn = function isEmail(value): value is string {
   return isString(value) && EMAIL_REGEX.test(value);
 };
 
+export const isLabId: PredicateFn = function isLabId(value): value is string {
+  return isString(value) && /^\d{2}-\d{6}$/.test(value);
+};
+
 export const isOnlyDigits: PredicateFn = function isOnlyDigits(
   value,
+): value is string | number {
+  return (isString(value) && /^\d+$/.test(value)) || Number.isInteger(value);
+};
+
+export const isRackBarcode: PredicateFn = function isRackBarcode(
+  value,
 ): value is string {
-  return isString(value) && /^\d+$/.test(value);
+  return isString(value) && /^[A-Z]{2}\d{8}$/.test(value);
 };
 
 export const isURL: PredicateFn = function isURL(value): value is string {
@@ -53,13 +63,3 @@ export const isURL: PredicateFn = function isURL(value): value is string {
 export const isWord: PredicateFn = function isWord(value): value is string {
   return isString(value) && /^[\w-]+$/.test(value);
 };
-
-export const isLabId: PredicateFn = function isLabId(value): value is string {
-  return isString(value) && /^\d{2}-\d{6}$/.test(value);
-};
-
-export const isRackBarcode: PredicateFn = function isRackBarcode(
-  value,
-): value is string {
-  return isString(value) && /^[A-Z]{2}\d{8}$/.test(value);
-};