From bcb13ba5b035025f84b86d9e968871ad8c620c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clem.auger@hotmail.fr>
Date: Thu, 16 May 2024 10:23:17 +0200
Subject: [PATCH] fix: types

---
 source/migration/index.ts                         |  1 -
 source/migration/migrateSituation.ts              | 15 ++++++++++++++-
 .../deleteKeyFromSituationAndFoldedSteps.ts       |  2 +-
 .../migrateSituation/getValueWithoutQuotes.ts     |  2 +-
 .../handleSituationKeysMigration.ts               |  7 ++++++-
 .../handleSituationValuesMigration.ts             |  7 ++++++-
 .../migrateSituation/handleSpecialCases.ts        |  7 +++++--
 source/migration/types.ts                         | 14 --------------
 8 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 100644 source/migration/types.ts

diff --git a/source/migration/index.ts b/source/migration/index.ts
index 47b030b..1392a39 100644
--- a/source/migration/index.ts
+++ b/source/migration/index.ts
@@ -44,4 +44,3 @@ Then, calling `migrateSituation` with the situation and the migration instructio
 */
 
 export * from './migrateSituation'
-export * from './types'
diff --git a/source/migration/migrateSituation.ts b/source/migration/migrateSituation.ts
index 8260ff8..837131b 100644
--- a/source/migration/migrateSituation.ts
+++ b/source/migration/migrateSituation.ts
@@ -1,8 +1,21 @@
-import { DottedName, MigrationType, Situation } from './types'
 import { getValueWithoutQuotes } from './migrateSituation/getValueWithoutQuotes'
 import { handleSituationKeysMigration } from './migrateSituation/handleSituationKeysMigration'
 import { handleSituationValuesMigration } from './migrateSituation/handleSituationValuesMigration'
 import { handleSpecialCases } from './migrateSituation/handleSpecialCases'
+import { Evaluation } from 'publicodes'
+
+export type NodeValue = Evaluation
+
+export type Situation = {
+  [key: string]: NodeValue
+}
+
+export type DottedName = string
+
+export type MigrationType = {
+  keysToMigrate: Record<DottedName, DottedName>
+  valuesToMigrate: Record<DottedName, Record<string, NodeValue>>
+}
 
 /**
  * Migrate rules and answers from a situation which used to work with an old version of a model to a new version according to the migration instructions.
diff --git a/source/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts b/source/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts
index 354a7dd..393779d 100644
--- a/source/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts
+++ b/source/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts
@@ -1,4 +1,4 @@
-import { DottedName, Situation } from '../types'
+import { DottedName, Situation } from '../migrateSituation'
 
 /**
  * Delete a key from the situation and from the foldedSteps if it exists.
diff --git a/source/migration/migrateSituation/getValueWithoutQuotes.ts b/source/migration/migrateSituation/getValueWithoutQuotes.ts
index c11f442..9cd8ef8 100644
--- a/source/migration/migrateSituation/getValueWithoutQuotes.ts
+++ b/source/migration/migrateSituation/getValueWithoutQuotes.ts
@@ -1,4 +1,4 @@
-import { NodeValue } from '../types'
+import { NodeValue } from '../migrateSituation'
 
 /**
  * Returns the value without quotes if it is a string.
diff --git a/source/migration/migrateSituation/handleSituationKeysMigration.ts b/source/migration/migrateSituation/handleSituationKeysMigration.ts
index 91f3e74..9e77d3f 100644
--- a/source/migration/migrateSituation/handleSituationKeysMigration.ts
+++ b/source/migration/migrateSituation/handleSituationKeysMigration.ts
@@ -1,4 +1,9 @@
-import { DottedName, MigrationType, NodeValue, Situation } from '../types'
+import {
+  DottedName,
+  MigrationType,
+  NodeValue,
+  Situation,
+} from '../migrateSituation'
 import { deleteKeyFromSituationAndFoldedSteps } from './deleteKeyFromSituationAndFoldedSteps'
 
 type Props = {
diff --git a/source/migration/migrateSituation/handleSituationValuesMigration.ts b/source/migration/migrateSituation/handleSituationValuesMigration.ts
index ae81abe..4bf9df5 100644
--- a/source/migration/migrateSituation/handleSituationValuesMigration.ts
+++ b/source/migration/migrateSituation/handleSituationValuesMigration.ts
@@ -1,4 +1,9 @@
-import { DottedName, MigrationType, NodeValue, Situation } from '../types'
+import {
+  DottedName,
+  MigrationType,
+  NodeValue,
+  Situation,
+} from '../migrateSituation'
 import { deleteKeyFromSituationAndFoldedSteps } from './deleteKeyFromSituationAndFoldedSteps'
 
 type Props = {
diff --git a/source/migration/migrateSituation/handleSpecialCases.ts b/source/migration/migrateSituation/handleSpecialCases.ts
index 12c4a29..667b9bd 100644
--- a/source/migration/migrateSituation/handleSpecialCases.ts
+++ b/source/migration/migrateSituation/handleSpecialCases.ts
@@ -1,7 +1,10 @@
+import { DottedName, Situation } from '../migrateSituation'
+
 type Props = {
-  ruleName: string
+  ruleName: DottedName
+  // Should be fixed
   nodeValue: any
-  situation: any
+  situation: Situation
 }
 
 // Handle migration of old value format : an object { valeur: number, unité: string }
diff --git a/source/migration/types.ts b/source/migration/types.ts
deleted file mode 100644
index cc8055a..0000000
--- a/source/migration/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Evaluation } from 'publicodes'
-
-export type NodeValue = Evaluation
-
-export type Situation = {
-  [key: string]: NodeValue
-}
-
-export type DottedName = string
-
-export type MigrationType = {
-  keysToMigrate: Record<DottedName, DottedName>
-  valuesToMigrate: Record<DottedName, Record<string, NodeValue>>
-}