Rename types used for parametric reforms.

src/lib/components/test_cases/TestCaseView.svelte

@@ -18,7 +18,7 @@
   import { waterfalls } from "$lib/decompositions"
   import type { EditionMode } from "$lib/editions"
   import { entityByKey, personEntityKey } from "$lib/entities"
-  import type { Reform } from "$lib/reforms"
+  import type { ParametricReform } from "$lib/reforms"
   import type { AxisDescription, Situation } from "$lib/situations"
   import {
     getSituationVariableValue,
@@ -55,7 +55,7 @@
   ) as Writable<EvaluationByNameArrayByCalculationName>
   const familyEntity = entityByKey[$session.familyEntityKey]
   const personEntity = entityByKey[personEntityKey]
-  const reform = getContext("reform") as Writable<Reform>
+  const reform = getContext("reform") as Writable<ParametricReform>
   const variableDefinitionByName = {
     age: {
       allowSlider: true,

src/lib/components/variables/VariableReferredScaleParameter.svelte

@@ -6,7 +6,7 @@
 
   import ScaleAtInstantEdit from "$lib/components/parameters/ScaleAtInstantEdit.svelte"
   import type { CalculationName } from "$lib/decompositions"
-  import type { Reform } from "$lib/reforms"
+  import type { ParametricReform } from "$lib/reforms"
   import { ReformChangeType } from "$lib/reforms"
 
   import VariableReferredParameterHeader from "./VariableReferredParameterHeader.svelte"
@@ -15,7 +15,7 @@
   export let depth: number
   export let parameter: ScaleParameter
 
-  const reform = getContext("reform") as Writable<Reform>
+  const reform = getContext("reform") as Writable<ParametricReform>
   const requestedCalculationsName = getContext(
     "requestedCalculationsName",
   ) as Writable<Set<CalculationName>>

src/lib/components/variables/VariableReferredValueParameter.svelte

@@ -4,7 +4,7 @@
   import type { Writable } from "svelte/store"
 
   import type { CalculationName } from "$lib/decompositions"
-  import type { Reform, ReformChangeParameter } from "$lib/reforms"
+  import type { ParametricReform, ValueParameterReform } from "$lib/reforms"
   import { ReformChangeType } from "$lib/reforms"
 
   import VariableReferredParameterHeader from "./VariableReferredParameterHeader.svelte"
@@ -14,14 +14,14 @@
   export let parameter: ValueParameter
 
   let instantValueCouplesArray: [string, ValueAtInstant][]
-  const reform = getContext("reform") as Writable<Reform>
+  const reform = getContext("reform") as Writable<ParametricReform>
   const requestedCalculationsName = getContext(
     "requestedCalculationsName",
   ) as Writable<Set<CalculationName>>
   let validValue = undefined
   let valueError = null
 
-  $: change = $reform[parameter.name] as ReformChangeParameter | undefined
+  $: change = $reform[parameter.name] as ValueParameterReform | undefined
 
   $: instantValueCouplesArray = Object.entries(parameter.values).sort(
     ([instant1], [instant2]) => instant2.localeCompare(instant1),

src/lib/reforms.ts

 import type { ScaleAtInstant } from "@openfisca/json-model"
 
-export interface Reform {
-  [parameterName: string]: ReformChange
-}
-
-export type ReformChange = ReformChangeParameter | ReformChangeScale
+export type ParameterReform = ValueParameterReform | ScaleParameterReform
 
-export interface ReformChangeBase {
+export interface ParameterReformBase {
   start: string
   stop?: string
   type: ReformChangeType
 }
 
-export interface ReformChangeParameter extends ReformChangeBase {
-  type: ReformChangeType.Parameter
-  value: number
+export interface ParametricReform {
+  [parameterName: string]: ParameterReform
 }
 
-export interface ReformChangeScale extends ReformChangeBase {
+export interface ScaleParameterReform extends ParameterReformBase {
   type: ReformChangeType.Scale
   scale: ScaleAtInstant
 }
 
+export interface ValueParameterReform extends ParameterReformBase {
+  type: ReformChangeType.Parameter
+  value: number
+}
+
 export enum ReformChangeType {
   Parameter = "parameter",
   Scale = "scale",

src/routes/__layout.svelte

@@ -25,7 +25,7 @@
     waterfalls,
   } from "$lib/decompositions"
   import { entityByKey } from "$lib/entities"
-  import type { Reform } from "$lib/reforms"
+  import type { ParametricReform } from "$lib/reforms"
   import type { Situation } from "$lib/situations"
   import {
     buildTestCasesWithoutNonInputVariables,
@@ -110,7 +110,7 @@
   )
   setContext("nonVirtualDecompositionsName", nonVirtualDecompositionsName)
 
-  let reformValue: Reform
+  let reformValue: ParametricReform
   if (browser) {
     const reformJson = localStorage.getItem("reform")
     if (reformJson !== null) {

src/routes/index.svelte

@@ -32,7 +32,7 @@
   } from "$lib/decompositions"
   import type { EditionMode } from "$lib/editions"
   import { entityByKey } from "$lib/entities"
-  import type { Reform } from "$lib/reforms"
+  import type { ParametricReform } from "$lib/reforms"
   import type {
     Axis,
     PopulationWithoutId,
@@ -89,7 +89,7 @@
     }>
   >
   setContext("newSelfTargetAProps", newSelfTargetAProps)
-  const reform = getContext("reform") as Writable<Reform>
+  const reform = getContext("reform") as Writable<ParametricReform>
   const requestedCalculationsName = getContext(
     "requestedCalculationsName",
   ) as Writable<Set<CalculationName>>

src/routes/simulations/[simulation].svelte

@@ -25,12 +25,12 @@
   import type { Writable } from "svelte/store"
 
   import { goto } from "$app/navigation"
-  import type { Reform } from "$lib/reforms"
+  import type { ParametricReform } from "$lib/reforms"
   import type { Situation } from "$lib/situations"
 
-  export let simulation: { reform: Reform; testCases: Situation[] }
+  export let simulation: { reform: ParametricReform; testCases: Situation[] }
 
-  const reform = getContext("reform") as Writable<Reform>
+  const reform = getContext("reform") as Writable<ParametricReform>
   const testCases = getContext("testCases") as Writable<Situation[]>
 
   onMount(() => {