Merge pull request #22 from SoftwareBrothers/fix/safe-parse-number

fix: check if string param is numeric before converting to Number
SoftwareBrothers · May 11, 2021 · 46dc226 · 46dc226
2 parents f9b06bc + 988381f
commit 46dc226
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/Resource.ts b/src/Resource.ts
@@ -4,6 +4,7 @@ import { BaseResource, ValidationError, Filter, BaseRecord, flat } from 'admin-b
 
 import { Property } from './Property'
 import { convertFilter } from './utils/filter/filter.converter'
+import safeParseNumber from './utils/safe-parse-number'
 
 type ParamsType = Record<string, any>;
 
@@ -146,9 +147,9 @@ export class Resource extends BaseResource {
 
       if (type === 'number') {
         if (property.isArray()) {
-          preparedParams[key] = param ? param.map((p) => Number(p)) : param
+          preparedParams[key] = param ? param.map((p) => safeParseNumber(p)) : param
         } else {
-          preparedParams[key] = Number(param)
+          preparedParams[key] = safeParseNumber(param)
         }
       }
 

diff --git a/src/utils/safe-parse-number.ts b/src/utils/safe-parse-number.ts
@@ -0,0 +1,16 @@
+/* eslint-disable no-restricted-globals */
+const isNumeric = (value: null | string | number | undefined): boolean => {
+  const stringValue = (String(value)).replace(/,/g, '.')
+
+  if (isNaN(parseFloat(stringValue))) return false
+
+  return isFinite(Number(stringValue))
+}
+
+const safeParseNumber = (value?: null | string | number): string | number | null | undefined => {
+  if (isNumeric(value)) return Number(value)
+
+  return value
+}
+
+export default safeParseNumber