cafe-utility 10.21.0 → 10.23.0

package/index.d.ts

@@ -53,7 +53,7 @@ declare function isNumber(value: any): value is number;
 declare function isBoolean(value: any): value is boolean;
 declare function isDate(value: any): value is Date;
 declare function isBlank(value: any): boolean;
-declare function isId(value: any): value is number | string;
+declare function isId(value: any): value is number;
 declare function randomLetterString(length: number): string;
 declare function randomAlphanumericString(length: number): string;
 declare function randomRichAsciiString(length: number): string;
@@ -64,6 +64,7 @@ declare function asNumber(number: any): number;
 declare function asBoolean(bool: any): boolean;
 declare function asDate(date: any): Date;
 declare function asNullableString(string: any): string | null;
+declare function asEmptiableString(string: any): string;
 declare function asId(value: any): number;
 declare function asTime(value: any): string;
 declare function asArray(value: any): unknown[];
@@ -547,6 +548,7 @@ export declare const Types: {
     asBoolean: typeof asBoolean;
     asDate: typeof asDate;
     asNullableString: typeof asNullableString;
+    asEmptiableString: typeof asEmptiableString;
     asId: typeof asId;
     asTime: typeof asTime;
     asArray: typeof asArray;

package/index.js

@@ -383,7 +383,7 @@ function isPromise(value) {
 }
 
 function isNumber(value) {
-    return !isNaN(value) && String(value) === String(parseFloat(value))
+    return typeof value === 'number' && !isNaN(value)
 }
 
 function isBoolean(value) {
@@ -399,8 +399,7 @@ function isBlank(value) {
 }
 
 function isId(value) {
-    const numeric = typeof value === 'string' ? parseInt(value, 10) : value
-    return Number.isInteger(numeric) && numeric >= 1
+    return isNumber(value) && Number.isInteger(value) && value >= 1
 }
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyz'
@@ -456,10 +455,14 @@ function asString(string) {
 }
 
 function asNumber(number) {
-    if (!isNumber(number)) {
+    if (isNumber(number)) {
+        return number
+    }
+    const parsed = parseFloat(number)
+    if (!isNumber(parsed)) {
         throw new TypeError('Expected number, got: ' + number)
     }
-    return number
+    return parsed
 }
 
 function asBoolean(bool) {
@@ -483,11 +486,22 @@ function asNullableString(string) {
     return string
 }
 
+function asEmptiableString(string) {
+    if (!isString(string)) {
+        throw new TypeError('Expected string, got: ' + string)
+    }
+    return string
+}
+
 function asId(value) {
-    if (!isId(value)) {
+    if (isId(value)) {
+        return value
+    }
+    const parsed = parseInt(value, 10)
+    if (!isId(parsed)) {
         throw new TypeError('Expected id, got: ' + value)
     }
-    return typeof value === 'string' ? parseInt(value, 10) : value
+    return parsed
 }
 
 function asTime(value) {
@@ -2872,6 +2886,7 @@ exports.Types = {
     asBoolean,
     asDate,
     asNullableString,
+    asEmptiableString,
     asId,
     asTime,
     asArray,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "10.21.0",
+    "version": "10.23.0",
     "description": "",
     "main": "index.js",
     "exports": {