fix: types

source/migration/index.ts

@@ -44,4 +44,3 @@ Then, calling `migrateSituation` with the situation and the migration instructio
 */
 
 export * from './migrateSituation'
-export * from './types'

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.

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.

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.

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 = {

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 = {

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 }