From ab403c445bcf82e72820af4d5771a74b01c7cf9d Mon Sep 17 00:00:00 2001 From: Benjamin Arias Date: Wed, 15 May 2024 13:52:59 +0200 Subject: [PATCH] feat: Extrait logique dans un helper --- source/migrations/migrateSituation.ts | 8 ++------ .../migrateSituation/getValueWithoutQuotes.ts | 11 +++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 source/migrations/migrateSituation/getValueWithoutQuotes.ts diff --git a/source/migrations/migrateSituation.ts b/source/migrations/migrateSituation.ts index deff427..827dcda 100644 --- a/source/migrations/migrateSituation.ts +++ b/source/migrations/migrateSituation.ts @@ -1,4 +1,5 @@ import { DottedName, MigrationType, Situation } from '../../types/types' +import { getValueWithoutQuotes } from './migrateSituation/getValueWithoutQuotes' import { handleSituationKeysMigration } from './migrateSituation/handleSituationKeysMigration' import { handleSituationValuesMigration } from './migrateSituation/handleSituationValuesMigration' import { handleSpecialCases } from './migrateSituation/handleSpecialCases' @@ -47,12 +48,7 @@ export function migrateSituation({ ] const formattedNodeValue = - typeof nodeValue === 'string' && - nodeValue.startsWith("'") && - nodeValue !== 'oui' && - nodeValue !== 'non' - ? nodeValue.slice(1, -1) - : (nodeValue as string) + getValueWithoutQuotes(nodeValue) || (nodeValue as string) if ( // We check if the value of the non supported ruleName value is a value to migrate. diff --git a/source/migrations/migrateSituation/getValueWithoutQuotes.ts b/source/migrations/migrateSituation/getValueWithoutQuotes.ts new file mode 100644 index 0000000..f4c2e69 --- /dev/null +++ b/source/migrations/migrateSituation/getValueWithoutQuotes.ts @@ -0,0 +1,11 @@ +export function getValueWithoutQuotes(value: string | number) { + if ( + typeof value !== 'string' || + !value.startsWith("'") || + value === 'oui' || + value === 'non' + ) { + return null + } + return value.slice(1, -1) +}