From 95f505cdc0dbbba28c9295b411bca86e22dcadf7 Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart <emmanuel@raviart.com> Date: Wed, 13 Oct 2021 22:41:56 +0200 Subject: [PATCH] Use package @openfisca/france-json. --- README.md | 14 +++----------- package-lock.json | 13 +++++++++++++ package.json | 1 + src/lib/decompositions.ts | 4 ++-- src/lib/entities.ts | 3 +-- src/lib/metadata.ts | 3 +-- src/lib/parameters.ts | 2 +- src/lib/reforms.ts | 3 +-- src/lib/situations.ts | 2 +- src/lib/variables.ts | 2 +- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index a999f7fee..ccfbd0b2a 100644 --- a/README.md +++ b/README.md @@ -15,23 +15,15 @@ Ce projet fonctionne avec [NodeJS](https://nodejs.org/fr/) version 16 ou supéri Il utilise la bibliothèque [xxhash-addon](https://www.npmjs.com/package/xxhash-addon), écrite en C. Pour pouvoir installer et compiler cette bibliothèque, il est nécessaire d'installer au préalable la [chaîne de compilation Node.js](https://github.com/ktrongnhan/xxhash-addon#installation), qui dépend de votre système d'exploitation. -Pour fonctionner, ce simulateur socio-fiscal utilise un export des paramètres et variables d'OpenFisca. Pour le récupérer, exécuter la commande suivante dans un terminal: - -```shell -git clone https://git.leximpact.dev/openfisca/openfisca-france-json -``` - -Une fois ces différentes opérations effectuées, exécuter les commandes ci-dessous pour vous déplacer dans le répertoire du projet, le lier aux paramètres et variables d'OpenFisca, puis installer les librairies nécessaires : +Exécuter les commandes ci-dessous pour télécharger le projet, vous déplacer dans son répertoire, puis installer les librairies nécessaires à son fonctionnement : ```shell git clone https://git.leximpact.dev/leximpact/leximpact-socio-fiscal-ui -cd leximpact-socio-fiscal-ui/src/lib/ -ln -s ../../../openfisca-france-json openfisca -cd ../../ +cd leximpact-socio-fiscal-ui npm install ``` -L'installation indique les librairies installées et s'achève sans erreur. +L'installation indique les librairies installées et doit s'achever sans erreur. ## Exécuter l'application - mode développeur diff --git a/package-lock.json b/package-lock.json index 4172562cc..2c132604c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@auditors/core": "^0.1.7", "@fontsource/lato": "^4.3.0", "@fontsource/lora": "^4.3.0", + "@openfisca/france-json": "^0.1.1", "@openfisca/json-model": "^0.15.7", "@sveltejs/adapter-node": "^1.0.0-next.49", "@sveltejs/kit": "^1.0.0-next.170", @@ -1921,6 +1922,12 @@ "node": ">= 8" } }, + "node_modules/@openfisca/france-json": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@openfisca/france-json/-/france-json-0.1.1.tgz", + "integrity": "sha512-7RM8TGGcTFYHZkdO7t17KZ1ljKZjc/Fl87oQfD5EXpMhmCYrYncgTxZivuvm0tYMl/iKpL91CKCBzZbytM+1rg==", + "dev": true + }, "node_modules/@openfisca/json-model": { "version": "0.15.9", "resolved": "https://registry.npmjs.org/@openfisca/json-model/-/json-model-0.15.9.tgz", @@ -8477,6 +8484,12 @@ "fastq": "^1.6.0" } }, + "@openfisca/france-json": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@openfisca/france-json/-/france-json-0.1.1.tgz", + "integrity": "sha512-7RM8TGGcTFYHZkdO7t17KZ1ljKZjc/Fl87oQfD5EXpMhmCYrYncgTxZivuvm0tYMl/iKpL91CKCBzZbytM+1rg==", + "dev": true + }, "@openfisca/json-model": { "version": "0.15.9", "resolved": "https://registry.npmjs.org/@openfisca/json-model/-/json-model-0.15.9.tgz", diff --git a/package.json b/package.json index 4bcf4d1e0..57e5cc242 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@auditors/core": "^0.1.7", "@fontsource/lato": "^4.3.0", "@fontsource/lora": "^4.3.0", + "@openfisca/france-json": "^0.1.1", "@openfisca/json-model": "^0.15.7", "@sveltejs/adapter-node": "^1.0.0-next.49", "@sveltejs/kit": "^1.0.0-next.170", diff --git a/src/lib/decompositions.ts b/src/lib/decompositions.ts index b8b3e30a1..cabbbc118 100644 --- a/src/lib/decompositions.ts +++ b/src/lib/decompositions.ts @@ -1,3 +1,5 @@ +import decompositionCoreByNameUnknown from "@openfisca/france-json/decompositions.json" +import waterfallsUnknown from "@openfisca/france-json/waterfalls.json" export type { Decomposition as DecompositionCore, DecompositionByName as DecompositionCoreByName, @@ -14,8 +16,6 @@ import type { } from "@openfisca/json-model" import type { CalculationName } from "$lib/calculations" -import decompositionCoreByNameUnknown from "$lib/openfisca/decompositions.json" -import waterfallsUnknown from "$lib/openfisca/waterfalls.json" import { reformChangesByName } from "$lib/reforms" import type { Situation } from "$lib/situations" diff --git a/src/lib/entities.ts b/src/lib/entities.ts index c96ca7a83..d61af97d5 100644 --- a/src/lib/entities.ts +++ b/src/lib/entities.ts @@ -1,7 +1,6 @@ +import entityByKeyUnknown from "@openfisca/france-json/entities.json" import type { EntityByKey } from "@openfisca/json-model" -import entityByKeyUnknown from "$lib/openfisca/entities.json" - export const entityByKey = entityByKeyUnknown as EntityByKey export const personEntityKey = Object.entries(entityByKey) diff --git a/src/lib/metadata.ts b/src/lib/metadata.ts index b64cb2984..4b6741729 100644 --- a/src/lib/metadata.ts +++ b/src/lib/metadata.ts @@ -1,5 +1,4 @@ +import metadataUnknown from "@openfisca/france-json/metadata.json" import type { Metadata } from "@openfisca/json-model" -import metadataUnknown from "$lib/openfisca/metadata.json" - export const metadata: Metadata = metadataUnknown diff --git a/src/lib/parameters.ts b/src/lib/parameters.ts index 0408ceefa..f961e4f30 100644 --- a/src/lib/parameters.ts +++ b/src/lib/parameters.ts @@ -1,3 +1,4 @@ +import rootParameterUnknown from "@openfisca/france-json/editable_processed_parameters.json" import type { Metadata, NodeParameter, @@ -21,7 +22,6 @@ import { } from "@openfisca/json-model" import { metadata } from "$lib/metadata" -import rootParameterUnknown from "$lib/openfisca/editable_processed_parameters.json" import { reformChangesByName } from "$lib/reforms" export interface InstantReferencesAndScale { diff --git a/src/lib/reforms.ts b/src/lib/reforms.ts index c63ba642c..0ef1f7dc0 100644 --- a/src/lib/reforms.ts +++ b/src/lib/reforms.ts @@ -1,11 +1,10 @@ +import reformChangesByNameUnknown from "@openfisca/france-json/reforms_changes.json" import type { Decomposition as DecompositionCore, ScaleAtInstant, Variable, } from "@openfisca/json-model" -import reformChangesByNameUnknown from "$lib/openfisca/reforms_changes.json" - export type ParameterReform = ValueParameterReform | ScaleParameterReform export interface ParameterReformBase { diff --git a/src/lib/situations.ts b/src/lib/situations.ts index 23fc2f21f..0a6bf97b2 100644 --- a/src/lib/situations.ts +++ b/src/lib/situations.ts @@ -1,3 +1,4 @@ +import testCasesCoreUnknown from "@openfisca/france-json/test_cases.json" import type { Entity, EntityByKey, @@ -8,7 +9,6 @@ import { getRolePersonsIdKey } from "@openfisca/json-model" import type { CalculationName } from "$lib/calculations" import { entityByKey } from "$lib/entities" -import testCasesCoreUnknown from "$lib/openfisca/test_cases.json" import type { ValuesByCalculationNameByVariableName, VariableValue, diff --git a/src/lib/variables.ts b/src/lib/variables.ts index 53081807d..0fa4c732c 100644 --- a/src/lib/variables.ts +++ b/src/lib/variables.ts @@ -1,3 +1,4 @@ +import variableSummaryByNameUnknown from "@openfisca/france-json/variables_summaries.json" import type { Formula, Reference, @@ -6,7 +7,6 @@ import type { } from "@openfisca/json-model" import type { CalculationName } from "$lib/calculations" -import variableSummaryByNameUnknown from "$lib/openfisca/variables_summaries.json" import { reformChangesByName } from "$lib/reforms" export interface InstantFormulaAndReferences { -- GitLab