Merge pull request #67 from vizzuhq/na-detection-in-unit

Add N.A. detection in data types unit check
vizzuhq · Dec 13, 2024 · dd9a5f2 · dd9a5f2
2 parents 9c57271 + 9be2ae2
commit dd9a5f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/plugins/data-types/CHANGELOG.md b/plugins/data-types/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [0.7.2]
+
+-   Add N/A detection in unit check
+
 ## [0.7.1]
 
 -   Add N/A protection in number detect

diff --git a/plugins/data-types/package.json b/plugins/data-types/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@vizzu/data-types",
 	"description": "Vizzu plugin for data types",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"type": "module",
 	"exports": {
 		".": {

diff --git a/plugins/data-types/src/utils/clearValue.ts b/plugins/data-types/src/utils/clearValue.ts
@@ -10,8 +10,7 @@ export const clearValue = (value: string | null | undefined): string | null | un
 		.replace(/^[−–—]/, '-')
 		.replace(/[\u2012\u2013\u2014\u2015]/g, '-')
 
-	const naText = naVariants.find((na) => cleanedValue === na)
-	if (naText) {
+	if (naVariants.includes(cleanedValue)) {
 		return ''
 	}
 	if (cleanedValue.includes('.')) {
@@ -38,8 +37,7 @@ const excelErrors = [
 ]
 
 export const fixErrorValues = (value: string): string => {
-	const errorText = excelErrors.find((error) => value === error)
-	if (errorText) {
+	if (excelErrors.includes(value)) {
 		return ''
 	}
 	return value

diff --git a/plugins/data-types/src/utils/unitCheck.ts b/plugins/data-types/src/utils/unitCheck.ts
@@ -82,8 +82,9 @@ export const unitCheck = (series: TypedSeries): void => {
 			(value) =>
 				value === '' ||
 				(typeof value === 'string' &&
-					(value.endsWith(unit) || value.startsWith(unit)) &&
-					!isNaN(Number(clearValue(value.replace(unit, '')))))
+					(clearValue(value) === '' ||
+						((value.endsWith(unit) || value.startsWith(unit)) &&
+							!isNaN(Number(clearValue(value.replace(unit, '')))))))
 		)
 
 	if (series?.values && hasUnit(series)) {