CatalaLang · EmileRolley · May 7, 2023 · May 5, 2023 · May 5, 2023 · May 5, 2023
diff --git a/INSTALL.md b/INSTALL.md
@@ -128,20 +128,33 @@ To uninstall, use
 
 ### Generating website assets
 
+#### Updating [`@catala-lang/catala-web-assets`](https://www.npmjs.com/package/@catala-lang/catala-web-assets) 
+
 The Catala website features assets generated by the Catala compiler. They are
 needed to build the website. To produce them, simply run
 
     make website-assets DUNE_PROFILE=release
 
 Then, use a helper script to copy them over to the `assets` directory of the
-Catala website.
+[`catala-web-assets`](https://github.com/CatalaLang/catala-web-assets)
+repository.
 
-    ./generate_website_assets.sh <path-to-catala-website>/assets
+    ./generate_website_assets.sh <path-to-catala-web-assets>/assets
 
-You will need the `groff` executable to generate the HTML versions of the man
+> You will need the `groff` executable to generate the HTML versions of the man
 pages, as well as the `rsync` executable to transfer files (preferred to `cp`)
 because it also works with a remote server.
 
+#### Updating [`@catala-lang/french-law`](https://www.npmjs.com/package/@catala-lang/french-law) 
+
+When a new version of the `french_law.js` (see the [dedicated
+README](https://github.com/CatalaLang/catala/tree/master/french_law/js#generating-the-source-files)
+to generate the lib) needs to be published, you need to execute from the
+`french_law/js` directory, the following commands:
+
+    npm version patch -m "Patch message"
+    npm publish
+
 ## Syntax highlighting
 
 See the [dedicated `README.md`](./syntax_highlighting/README.md).
diff --git a/Makefile b/Makefile
@@ -274,7 +274,7 @@ run_french_law_library_benchmark_js: build_french_law_library_js
 
 #> build_french_law_library_js		: Builds the JS version of the OCaml French law library
 build_french_law_library_js:
-	dune build $(FRENCH_LAW_JS_LIB_DIR)/french_law.js
+	dune build $(FRENCH_LAW_JS_LIB_DIR)/src/french_law.js
 
 #> build_french_law_library_web_api	: Builds the web API of the French law library
 build_french_law_library_web_api: build_french_law_library_js generate_french_law_json_schemas

diff --git a/french_law/js/.gitignore b/french_law/js/.gitignore
@@ -1 +1,3 @@
-node_modules/
+node_modules/
+lib/
+*.bs.js
diff --git a/french_law/js/README.md b/french_law/js/README.md
@@ -1,7 +1,7 @@
-# Javascript French Law Library
+# [`@catala-lang/french-law`](https://www.npmjs.com/package/@catala-lang/french-law?activeTab=readme) ![npm][npm]
 
 This folder contains a ready-to-use Javascript library featuring French public
-algorithms coded up in Catala.
+algorithms coded up in Catala and the corresponding ReScript wrapper.
 
 ## Generating the source files
 
@@ -22,12 +22,21 @@ make build_french_law_library_js
 
 ## API description
 
-The `french_law.js` library exposes:
+The `./src/french_law.js` library exposes:
 
 - an [event manager](#the-event-manager)
 - a list of [API functions](#api-functions)
 - a list of fully exposed [sub-libraries](#sub-libraries)
 
+### ReScript
+
+The ReScript API is essentialy the same that the JS one within the
+`CatalaFrenchLaw` top module.
+
+Example of project using the ReScript wrapper:
+
+* [`catala-website`](https://github.com/CatalaLang/catala-website)
+
 ### The event manager
 
 A JavaScript object `eventsManager` is exposed with three callable methods:
@@ -137,3 +146,6 @@ var allocationsFamiliales = frenchLaw.AllocationsFamilialesLib
 // corresponding to the file: `../ocaml/law_source/aides_logement_api_web.ml
 var aidesLogement = frenchLaw.AidesLogementLib
 ```
+
+
+[npm]: https://img.shields.io/npm/v/@catala-lang/french-law
diff --git a/french_law/js/bsconfig.json b/french_law/js/bsconfig.json
@@ -0,0 +1,15 @@
+{
+  "name": "@catala-lang/french-law",
+  "refmt": 3,
+  "sources": ["src"],
+  "package-specs": [
+    {
+      "module": "es6",
+      "in-source": true
+    }
+  ],
+  "suffix": ".bs.js",
+  "bs-dependencies": [
+    "@catala-lang/rescript-catala"
+  ]
+}
diff --git a/french_law/js/dune b/french_law/js/dune
diff --git a/french_law/js/examples.js b/french_law/js/examples.js
@@ -1,4 +1,4 @@
-var Law = require("./french_law.js");
+var Law = require("./src/french_law.js");
 var Benchmark = require("benchmark");
 const util = require("util");
 const { cachedDataVersionTag } = require("v8");
@@ -7,33 +7,33 @@ var suite = new Benchmark.Suite();
 
 function run_computation_AF(log) {
   var result = Law.computeAllocationsFamiliales({
-    "iDateCouranteIn": "2020-04-20",
-    "iEnfantsIn": [
+    iDateCouranteIn: "2020-04-20",
+    iEnfantsIn: [
       {
-        "dIdentifiant": 0,
-        "dRemunerationMensuelle": 0,
-        "dDateDeNaissance": "2003-02-02",
-        "dPriseEnCharge": { kind: "EffectiveEtPermanente", payload: null },
-        "dADejaOuvertDroitAuxAllocationsFamiliales": true,
-        "dBeneficieTitrePersonnelAidePersonnelleLogement": false,
+        dIdentifiant: 0,
+        dRemunerationMensuelle: 0,
+        dDateDeNaissance: "2003-02-02",
+        dPriseEnCharge: { kind: "EffectiveEtPermanente", payload: null },
+        dADejaOuvertDroitAuxAllocationsFamiliales: true,
+        dBeneficieTitrePersonnelAidePersonnelleLogement: false,
       },
       {
-        "dIdentifiant": 1,
-        "dRemunerationMensuelle": 300,
-        "dDateDeNaissance": "2013-09-30",
-        "dPriseEnCharge": {
-          "kind": "GardeAlterneePartageAllocations",
-          "payload": null,
+        dIdentifiant: 1,
+        dRemunerationMensuelle: 300,
+        dDateDeNaissance: "2013-09-30",
+        dPriseEnCharge: {
+          kind: "GardeAlterneePartageAllocations",
+          payload: null,
         },
-        "dADejaOuvertDroitAuxAllocationsFamiliales": true,
-        "dBeneficieTitrePersonnelAidePersonnelleLogement": false,
+        dADejaOuvertDroitAuxAllocationsFamiliales: true,
+        dBeneficieTitrePersonnelAidePersonnelleLogement: false,
       },
     ],
-    "iRessourcesMenageIn": 30000,
-    "iResidenceIn": { "kind": "Metropole", "payload": null },
-    "iPersonneChargeEffectivePermanenteEstParentIn": true,
-    "iPersonneChargeEffectivePermanenteRemplitTitreIIn": true,
-    "iAvaitEnfantAChargeAvant1erJanvier2012In": false,
+    iRessourcesMenageIn: 30000,
+    iResidenceIn: { kind: "Metropole", payload: null },
+    iPersonneChargeEffectivePermanenteEstParentIn: true,
+    iPersonneChargeEffectivePermanenteRemplitTitreIIn: true,
+    iAvaitEnfantAChargeAvant1erJanvier2012In: false,
   });
   if (log) {
     console.log(
@@ -50,121 +50,121 @@ function run_computation_AF(log) {
 
 function run_computation_AL(log) {
   var result = Law.computeAidesAuLogement({
-    "menageIn": {
-      "prestationsRecues": [],
-      "logement": {
-        "residencePrincipale": true,
-        "estEhpadOuMaisonAutonomieL31312Asf": false,
-        "modeOccupation": {
-          "kind": "Locataire",
-          "payload": {
-            "bailleur": {
-              "kind": "BailleurPrive"
+    menageIn: {
+      prestationsRecues: [],
+      logement: {
+        residencePrincipale: true,
+        estEhpadOuMaisonAutonomieL31312Asf: false,
+        modeOccupation: {
+          kind: "Locataire",
+          payload: {
+            bailleur: {
+              kind: "BailleurPrive",
             },
-            "beneficiaireAideAdulteOuEnfantHandicapes": false,
-            "logementEstChambre": false,
-            "colocation": false,
-            "ageesOuHandicapAdultesHebergeesOnereuxParticuliers": false,
-            "logementMeubleD8422": false,
-            "changementLogementD8424": {
-              "kind": "PasDeChangement",
-              "payload": null
+            beneficiaireAideAdulteOuEnfantHandicapes: false,
+            logementEstChambre: false,
+            colocation: false,
+            ageesOuHandicapAdultesHebergeesOnereuxParticuliers: false,
+            logementMeubleD8422: false,
+            changementLogementD8424: {
+              kind: "PasDeChangement",
+              payload: null,
             },
-            "loyerPrincipal": 450
-          }
+            loyerPrincipal: 450,
+          },
         },
-        "proprietaire": {
-          "kind": "Autre",
-          "payload": null
+        proprietaire: {
+          kind: "Autre",
+          payload: null,
         },
-        "loueOuSousLoueADesTiers": {
-          "kind": "Non"
+        loueOuSousLoueADesTiers: {
+          kind: "Non",
         },
-        "usufruit": {
-          "kind": "Autre",
-          "payload": null
+        usufruit: {
+          kind: "Autre",
+          payload: null,
         },
-        "logementDecentL89462": true,
-        "zone": {
-          "kind": "Zone2"
+        logementDecentL89462: true,
+        zone: {
+          kind: "Zone2",
         },
-        "surfaceMCarres": 65
+        surfaceMCarres: 65,
       },
-      "personnesACharge": [
+      personnesACharge: [
         {
-          "kind": "EnfantACharge",
-          "payload": {
-            "aDejaOuvertDroitAuxAllocationsFamiliales": true,
-            "remunerationMensuelle": 0,
-            "nationalite": {
-              "kind": "Francaise",
-              "payload": null,
+          kind: "EnfantACharge",
+          payload: {
+            aDejaOuvertDroitAuxAllocationsFamiliales: true,
+            remunerationMensuelle: 0,
+            nationalite: {
+              kind: "Francaise",
+              payload: null,
             },
-            "etudesApprentissageStageFormationProImpossibiliteTravail": false,
-            "obligationScolaire": {
-              "kind": "Pendant",
-              "payload": null,
+            etudesApprentissageStageFormationProImpossibiliteTravail: false,
+            obligationScolaire: {
+              kind: "Pendant",
+              payload: null,
             },
-            "situationGardeAlternee": {
-              "kind": "PasDeGardeAlternee",
-              "payload": null,
+            situationGardeAlternee: {
+              kind: "PasDeGardeAlternee",
+              payload: null,
             },
-            "dateDeNaissance": "2015-01-01",
-            "identifiant": 0
-          }
+            dateDeNaissance: "2015-01-01",
+            identifiant: 0,
+          },
         },
         {
-          "kind": "EnfantACharge",
-          "payload": {
-            "aDejaOuvertDroitAuxAllocationsFamiliales": true,
-            "remunerationMensuelle": 0,
-            "nationalite": {
-              "kind": "Francaise",
-              "payload": null,
+          kind: "EnfantACharge",
+          payload: {
+            aDejaOuvertDroitAuxAllocationsFamiliales: true,
+            remunerationMensuelle: 0,
+            nationalite: {
+              kind: "Francaise",
+              payload: null,
             },
-            "etudesApprentissageStageFormationProImpossibiliteTravail": false,
-            "obligationScolaire": {
-              "kind": "Pendant",
-              "payload": null,
+            etudesApprentissageStageFormationProImpossibiliteTravail: false,
+            obligationScolaire: {
+              kind: "Pendant",
+              payload: null,
             },
-            "situationGardeAlternee": {
-              "kind": "PasDeGardeAlternee",
-              "payload": null,
+            situationGardeAlternee: {
+              kind: "PasDeGardeAlternee",
+              payload: null,
             },
-            "dateDeNaissance": "2016-01-01",
-            "identifiant": 1
-          }
-        }
+            dateDeNaissance: "2016-01-01",
+            identifiant: 1,
+          },
+        },
       ],
-      "nombreAutresOccupantsLogement": 0,
-      "situationFamiliale": {
-        "kind": "Concubins",
-        "payload": null
+      nombreAutresOccupantsLogement: 0,
+      situationFamiliale: {
+        kind: "Concubins",
+        payload: null,
+      },
+      conditionRattacheFoyerFiscalParentIfi: false,
+      enfantANaitreApresQuatriemeMoisGrossesse: false,
+      personnesAgeesHandicapeesFoyerR8444: false,
+      residence: {
+        kind: "Metropole",
+        payload: null,
       },
-      "conditionRattacheFoyerFiscalParentIfi": false,
-      "enfantANaitreApresQuatriemeMoisGrossesse": false,
-      "personnesAgeesHandicapeesFoyerR8444": false,
-      "residence": {
-        "kind": "Metropole",
-        "payload": null
-      }
     },
-    "demandeurIn": {
-      "nationalite": {
-        "kind": "Francaise",
-        "payload": null,
+    demandeurIn: {
+      nationalite: {
+        kind: "Francaise",
+        payload: null,
       },
-      "estNonSalarieAgricoleL7818L78146CodeRural": false,
-      "magistratFonctionnaireCentreInteretsMaterielsFamiliauxHorsMayotte": false,
-      "patrimoine": {
-        "produisantRevenuPeriodeR82233R8224": 0,
-        "neProduisantPasRevenuPeriodeR82233R8224": 0
+      estNonSalarieAgricoleL7818L78146CodeRural: false,
+      magistratFonctionnaireCentreInteretsMaterielsFamiliauxHorsMayotte: false,
+      patrimoine: {
+        produisantRevenuPeriodeR82233R8224: 0,
+        neProduisantPasRevenuPeriodeR82233R8224: 0,
       },
-      "personneHebergeeCentreSoinLL162223SecuriteSociale": false,
-      "dateNaissance": "1992-01-01"
+      personneHebergeeCentreSoinLL162223SecuriteSociale: false,
+      dateNaissance: "1992-01-01",
     },
-    "dateCouranteIn": "2022-05-01",
-    "ressourcesMenagePrisesEnCompteIn": 11500,
+    dateCouranteIn: "2022-05-01",
+    ressourcesMenagePrisesEnCompteIn: 11500,
   });
   if (log) {
     console.log(