@hestia-earth/engine-models 0.75.3 → 0.75.4

package/config/Site.json

@@ -1,5 +1,13 @@
 {
   "models": [
+    {
+      "key": "measurements",
+      "model": "hestia",
+      "value": "soilMeasurement",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "stage": 1
+    },
     [
       {
         "key": "measurements",

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const ENGINE_VERSION = "0.75.3";
+export declare const ENGINE_VERSION = "0.75.4";

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ENGINE_VERSION = void 0;
-exports.ENGINE_VERSION = '0.75.3';
+exports.ENGINE_VERSION = '0.75.4';

package/model-links.json

@@ -2927,7 +2927,7 @@
     {
       "path": "hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.py",
       "docPath": "hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.md",
-      "guidePath": "ipcc2019-animal-milkYieldPerAnimal#IPCC%20(2019)",
+      "guidePath": "animal-milkYieldPerAnimal#IPCC%20(2019)",
       "model": "ipcc2019",
       "modelKey": "animal.milkYieldPerAnimal"
     },
@@ -10013,6 +10013,32 @@
           "term": "trueProteinContent"
         }
       ],
+      "excretaKgMassTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        }
+      ],
+      "excretaKgNTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        },
+        {
+          "model": "pooreNemecek2018",
+          "modelKey": "excretaKgN"
+        }
+      ],
+      "excretaKgVsTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        },
+        {
+          "model": "pooreNemecek2018",
+          "modelKey": "excretaKgVs"
+        }
+      ],
       "isGrazingAnimal": [
         {
           "model": "cycle",
@@ -10156,18 +10182,6 @@
           "model": "ipcc2019",
           "modelKey": "animal.milkYieldPerAnimal"
         }
-      ],
-      "excretaKgNTermIds": [
-        {
-          "model": "pooreNemecek2018",
-          "modelKey": "excretaKgN"
-        }
-      ],
-      "excretaKgVsTermIds": [
-        {
-          "model": "pooreNemecek2018",
-          "modelKey": "excretaKgVs"
-        }
       ]
     },
     "crop-property": {
@@ -10388,30 +10402,180 @@
         }
       ]
     },
-    "liveAquaticSpecies": {
-      "isGrazingAnimal": [
+    "animalProduct": {
+      "excretaKgMassTermIds": [
         {
           "model": "cycle",
-          "modelKey": "completeness.freshForage"
+          "modelKey": "completeness.excreta"
         }
       ],
-      "defaultSalinity": [
+      "excretaKgNTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        },
+        {
+          "model": "pooreNemecek2018",
+          "modelKey": "excretaKgN"
+        }
+      ],
+      "excretaKgVsTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        },
+        {
+          "model": "pooreNemecek2018",
+          "modelKey": "excretaKgVs"
+        }
+      ],
+      "global_economic_value_share": [
+        {
+          "model": "cycle",
+          "modelKey": "product.economicValueShare"
+        },
+        {
+          "model": "cycle",
+          "modelKey": "product.price"
+        }
+      ],
+      "ecoalimMapping": [
+        {
+          "model": "ecoalimV9",
+          "modelKey": "cycle"
+        },
+        {
+          "model": "ecoalimV9",
+          "modelKey": "impact_assessment"
+        }
+      ],
+      "animalProductGroupingFAOEquivalent": [
+        {
+          "model": "faostat2018",
+          "term": "liveweightPerHead"
+        },
+        {
+          "model": "faostat2018",
+          "modelKey": "product.price"
+        }
+      ],
+      "animalProductGroupingFAO": [
+        {
+          "model": "faostat2018",
+          "term": "liveweightPerHead"
+        },
+        {
+          "model": "faostat2018",
+          "modelKey": "product.price"
+        }
+      ],
+      "liveAnimalTermId": [
         {
           "model": "hestia",
-          "term": "waterSalinity"
+          "modelKey": "liveAnimal"
+        },
+        {
+          "model": "hestia",
+          "modelKey": "milkYield"
+        }
+      ],
+      "milkYieldPracticeTermId": [
+        {
+          "model": "hestia",
+          "modelKey": "milkYield"
+        }
+      ],
+      "digestibility": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirEntericFermentation"
+        }
+      ],
+      "percentageYmMethaneConversionFactorEntericFermentation": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirEntericFermentation"
+        }
+      ],
+      "percentageYmMethaneConversionFactorEntericFermentation-sd": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirEntericFermentation"
+        }
+      ],
+      "defaultPercentageYmMethaneConversionFactorEntericFermentation": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirEntericFermentation"
+        }
+      ],
+      "defaultPercentageYmMethaneConversionFactorEntericFermentation-min": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirEntericFermentation"
+        }
+      ],
+      "defaultPercentageYmMethaneConversionFactorEntericFermentation-max": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirEntericFermentation"
+        }
+      ],
+      "mjKgEvWoolNetEnergyWoolIpcc2019": [
+        {
+          "model": "ipcc2019",
+          "modelKey": "pastureGrass"
+        },
+        {
+          "model": "ipcc2019",
+          "modelKey": "animal.pastureGrass"
+        }
+      ],
+      "allowedLiveAnimalTermIds": [
+        {
+          "model": "ipcc2019",
+          "modelKey": "animal.pastureGrass"
+        }
+      ]
+    },
+    "liveAquaticSpecies": {
+      "excretaKgMassTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
         }
       ],
       "excretaKgNTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        },
         {
           "model": "pooreNemecek2018",
           "modelKey": "excretaKgN"
         }
       ],
       "excretaKgVsTermIds": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.excreta"
+        },
         {
           "model": "pooreNemecek2018",
           "modelKey": "excretaKgVs"
         }
+      ],
+      "isGrazingAnimal": [
+        {
+          "model": "cycle",
+          "modelKey": "completeness.freshForage"
+        }
+      ],
+      "defaultSalinity": [
+        {
+          "model": "hestia",
+          "term": "waterSalinity"
+        }
       ]
     },
     "seed": {
@@ -10582,128 +10746,6 @@
         }
       ]
     },
-    "animalProduct": {
-      "global_economic_value_share": [
-        {
-          "model": "cycle",
-          "modelKey": "product.economicValueShare"
-        },
-        {
-          "model": "cycle",
-          "modelKey": "product.price"
-        }
-      ],
-      "ecoalimMapping": [
-        {
-          "model": "ecoalimV9",
-          "modelKey": "cycle"
-        },
-        {
-          "model": "ecoalimV9",
-          "modelKey": "impact_assessment"
-        }
-      ],
-      "animalProductGroupingFAOEquivalent": [
-        {
-          "model": "faostat2018",
-          "term": "liveweightPerHead"
-        },
-        {
-          "model": "faostat2018",
-          "modelKey": "product.price"
-        }
-      ],
-      "animalProductGroupingFAO": [
-        {
-          "model": "faostat2018",
-          "term": "liveweightPerHead"
-        },
-        {
-          "model": "faostat2018",
-          "modelKey": "product.price"
-        }
-      ],
-      "liveAnimalTermId": [
-        {
-          "model": "hestia",
-          "modelKey": "liveAnimal"
-        },
-        {
-          "model": "hestia",
-          "modelKey": "milkYield"
-        }
-      ],
-      "milkYieldPracticeTermId": [
-        {
-          "model": "hestia",
-          "modelKey": "milkYield"
-        }
-      ],
-      "digestibility": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirEntericFermentation"
-        }
-      ],
-      "percentageYmMethaneConversionFactorEntericFermentation": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirEntericFermentation"
-        }
-      ],
-      "percentageYmMethaneConversionFactorEntericFermentation-sd": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirEntericFermentation"
-        }
-      ],
-      "defaultPercentageYmMethaneConversionFactorEntericFermentation": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirEntericFermentation"
-        }
-      ],
-      "defaultPercentageYmMethaneConversionFactorEntericFermentation-min": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirEntericFermentation"
-        }
-      ],
-      "defaultPercentageYmMethaneConversionFactorEntericFermentation-max": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirEntericFermentation"
-        }
-      ],
-      "mjKgEvWoolNetEnergyWoolIpcc2019": [
-        {
-          "model": "ipcc2019",
-          "modelKey": "pastureGrass"
-        },
-        {
-          "model": "ipcc2019",
-          "modelKey": "animal.pastureGrass"
-        }
-      ],
-      "allowedLiveAnimalTermIds": [
-        {
-          "model": "ipcc2019",
-          "modelKey": "animal.pastureGrass"
-        }
-      ],
-      "excretaKgNTermIds": [
-        {
-          "model": "pooreNemecek2018",
-          "modelKey": "excretaKgN"
-        }
-      ],
-      "excretaKgVsTermIds": [
-        {
-          "model": "pooreNemecek2018",
-          "modelKey": "excretaKgVs"
-        }
-      ]
-    },
     "waste": {
       "global_economic_value_share": [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/engine-models",
-  "version": "0.75.3",
+  "version": "0.75.4",
   "description": "HESTIA Engine Models",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "scripts": {
     "build:models": "node scripts/generate-models-links.js",
     "build:documentation": "node scripts/generate-documentation.js",
-    "build": "npm run build:models && npm run build:documentation",
+    "build": "./build-models-json.sh && npm run build:models && npm run build:documentation",
     "build:module": "rm -rf dist && tsc -p tsconfig.dist.json",
     "lint": "tsc --noEmit && eslint .",
     "lint:fix": "npm run lint -- --fix",
@@ -18,6 +18,7 @@
     "test:jsonld": "hestia-validate-jsonld tests/fixtures",
     "test:terms": "node scripts/validate-terms-models.js && hestia-validate-terms tests/fixtures",
     "validate:config": "ajv validate -s scripts/config-schema.json -d config/Cycle.json -d config/ImpactAssessment.json -d config/Site.json",
+    "validate:models": "node scripts/validate-models-schema.js",
     "validate:docs": "node scripts/validate-documentation.js",
     "validate:calculations": "ajv validate -s scripts/calculations-schema.json -d config/run-calculations.json -d config/trigger-calculations.json",
     "prepare-release": "node scripts/update-package-version.js && npm run build",
@@ -70,12 +71,14 @@
     "dotenv": "^8.6.0",
     "eslint": "^7.32.0",
     "eslint-plugin-jsdoc": "^30.7.13",
+    "glob": "^11.0.3",
     "husky": "^4.3.8",
     "jest": "^29.7.0",
     "lodash.merge": "^4.6.2",
     "pluralize": "^8.0.0",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.4.4"
+    "ts-jest": "^29.4.4",
+    "typescript": "^5.9.3"
   },
   "standard-version": {
     "scripts": {