From e4c882ca6806155d72fafc3b476456b46ee87420 Mon Sep 17 00:00:00 2001
From: Benjamin Arias <bjlaa@proton.me>
Date: Wed, 15 May 2024 14:27:52 +0200
Subject: [PATCH] fix: Typing

---
 source/migrations/migrateSituation/getValueWithoutQuotes.ts | 4 +++-
 .../migrateSituation/handleSituationValuesMigration.ts      | 2 +-
 types/types.d.ts                                            | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/migrations/migrateSituation/getValueWithoutQuotes.ts b/source/migrations/migrateSituation/getValueWithoutQuotes.ts
index f4c2e69..daf2758 100644
--- a/source/migrations/migrateSituation/getValueWithoutQuotes.ts
+++ b/source/migrations/migrateSituation/getValueWithoutQuotes.ts
@@ -1,4 +1,6 @@
-export function getValueWithoutQuotes(value: string | number) {
+import { NodeValue } from '../../../types/types'
+
+export function getValueWithoutQuotes(value: NodeValue) {
   if (
     typeof value !== 'string' ||
     !value.startsWith("'") ||
diff --git a/source/migrations/migrateSituation/handleSituationValuesMigration.ts b/source/migrations/migrateSituation/handleSituationValuesMigration.ts
index 8f89539..de5c1bd 100644
--- a/source/migrations/migrateSituation/handleSituationValuesMigration.ts
+++ b/source/migrations/migrateSituation/handleSituationValuesMigration.ts
@@ -22,7 +22,7 @@ function getMigratedValue({
   ruleName: DottedName
   nodeValue: NodeValue
   migrationInstructions: MigrationType
-}): string | number {
+}): NodeValue {
   if (
     typeof migrationInstructions.valuesToMigrate[ruleName][
       nodeValue as string
diff --git a/types/types.d.ts b/types/types.d.ts
index c6979a5..cc8055a 100644
--- a/types/types.d.ts
+++ b/types/types.d.ts
@@ -1,7 +1,9 @@
 import { Evaluation } from 'publicodes'
 
+export type NodeValue = Evaluation
+
 export type Situation = {
-  [key: string]: string | number
+  [key: string]: NodeValue
 }
 
 export type DottedName = string
@@ -10,5 +12,3 @@ export type MigrationType = {
   keysToMigrate: Record<DottedName, DottedName>
   valuesToMigrate: Record<DottedName, Record<string, NodeValue>>
 }
-
-export type NodeValue = Evaluation