@hestia-earth/engine-models 0.87.0 → 0.87.3

package/cjs/validate-config.d.ts

@@ -1,11 +1,126 @@
-import { allowedType, IOrchestratorModelConfig } from './config';
+import { allowedType, IOrchestratorConfig, IOrchestratorModelConfig } from './config';
+/**
+ * JSON Schema (draft-07) describing an orchestrator configuration file.
+ * Note: it uses no external `$ref` and no `format` keyword, so it compiles with any ajv version.
+ */
+export declare const configSchema: {
+    $schema: string;
+    type: string;
+    definitions: {
+        runArgs: {
+            type: string;
+            properties: {
+                skipEmptyValue: {
+                    type: string;
+                };
+                skipAggregated: {
+                    type: string;
+                };
+                termId: {
+                    type: string;
+                };
+                runNonAddedTerm: {
+                    type: string;
+                };
+                runNonMeasured: {
+                    type: string;
+                };
+            };
+        };
+        mergeArgs: {
+            type: string;
+            properties: {
+                sameMethodModel: {
+                    type: string;
+                };
+                skipSameTerm: {
+                    type: string;
+                };
+                replaceThreshold: {
+                    type: string;
+                    minItems: number;
+                    maxItems: number;
+                    items: {
+                        type: string;
+                    }[];
+                };
+                replaceLowerTier: {
+                    type: string;
+                };
+                matchDatesFormat: {
+                    type: string;
+                };
+            };
+        };
+        model: {
+            type: string;
+            properties: {
+                key: {
+                    type: string;
+                };
+                model: {
+                    type: string;
+                };
+                value: {
+                    type: string;
+                };
+                runStrategy: {
+                    type: string;
+                    enum: string[];
+                };
+                runArgs: {
+                    $ref: string;
+                };
+                mergeStrategy: {
+                    type: string;
+                    enum: string[];
+                };
+                mergeArgs: {
+                    $ref: string;
+                };
+                stage: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                };
+            };
+            required: string[];
+        };
+        "model-list": {
+            anyOf: ({
+                $ref: string;
+                type?: undefined;
+                items?: undefined;
+            } | {
+                type: string;
+                items: {
+                    $ref: string;
+                };
+                $ref?: undefined;
+            })[];
+        };
+    };
+    properties: {
+        models: {
+            type: string;
+            items: {
+                $ref: string;
+            };
+        };
+    };
+    required: string[];
+};
+/**
+ * Either a node type, in which case the bundled configuration is used, or a configuration to validate.
+ */
+export type configOrNodeType = allowedType | IOrchestratorConfig;
 /**
  * Use inter-dependencies to detect models that are in the wrong order.
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  * @returns List of models that have dependencies that could not be found prior to running.
  */
-export declare const validateConfigOrder: (nodeType: allowedType) => {
+export declare const validateConfigOrder: (config: configOrNodeType) => {
     model: IOrchestratorModelConfig;
     existing: string[];
     missing: string[];
@@ -14,6 +129,6 @@ export declare const validateConfigOrder: (nodeType: allowedType) => {
  * Detect multiple models running in parallel when they should not.
  * Note: we use the `mergeArgs` to handle special cases when multiple identical models CAN run in parallel
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  */
-export declare const validateConfigDuplicates: (nodeType: allowedType) => IOrchestratorModelConfig[];
+export declare const validateConfigDuplicates: (config: configOrNodeType) => IOrchestratorModelConfig[];

package/cjs/validate-config.js

@@ -36,9 +36,18 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateConfigDuplicates = exports.validateConfigOrder = void 0;
+exports.validateConfigDuplicates = exports.validateConfigOrder = exports.configSchema = void 0;
 var config_1 = require("./config");
 var utils_1 = require("./utils");
+var schema = require("../config/config-schema.json");
+/**
+ * JSON Schema (draft-07) describing an orchestrator configuration file.
+ * Note: it uses no external `$ref` and no `format` keyword, so it compiles with any ajv version.
+ */
+exports.configSchema = schema;
+var resolveConfig = function (config) {
+    return typeof config === 'string' ? (0, config_1.loadConfig)(config) : config;
+};
 // models not included in the links
 var skipModels = ['emissions.deleted', 'transformations'];
 var isHestiaResidueCyclicModel = function (_a) {
@@ -85,13 +94,12 @@ var matchDependencies = function (models) { return function (model) {
 /**
  * Use inter-dependencies to detect models that are in the wrong order.
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  * @returns List of models that have dependencies that could not be found prior to running.
  */
-var validateConfigOrder = function (nodeType) {
-    var config = (0, config_1.loadConfig)(nodeType);
+var validateConfigOrder = function (config) {
     // flatten all models to process one by one, starting with the last one
-    var models = config.models.flat();
+    var models = resolveConfig(config).models.flat();
     var results = models.filter(includeModel).map(matchDependencies(models));
     return results.filter(function (r) { return r.missing.length > 0; });
 };
@@ -109,12 +117,13 @@ var findDuplicatedConfigs = function (models) {
  * Detect multiple models running in parallel when they should not.
  * Note: we use the `mergeArgs` to handle special cases when multiple identical models CAN run in parallel
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  */
-var validateConfigDuplicates = function (nodeType) {
-    var config = (0, config_1.loadConfig)(nodeType);
-    var duplicates = config.models
-        .map(function (value) { return (Array.isArray(value) ? findDuplicatedConfigs(value) : []); })
+var validateConfigDuplicates = function (config) {
+    var duplicates = resolveConfig(config)
+        .models.map(function (value) {
+        return Array.isArray(value) ? findDuplicatedConfigs(value) : [];
+    })
         .flat(2);
     return duplicates;
 };

package/cjs/version.d.ts

@@ -1 +1 @@
-export declare const ENGINE_VERSION = "0.87.0";
+export declare const ENGINE_VERSION = "0.87.3";

package/cjs/version.js

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

package/config/config-schema.json

@@ -0,0 +1,108 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "type": "object",
+  "definitions": {
+    "runArgs": {
+      "type": "object",
+      "properties": {
+        "skipEmptyValue": {
+          "type": "boolean"
+        },
+        "skipAggregated": {
+          "type": "boolean"
+        },
+        "termId": {
+          "type": "string"
+        },
+        "runNonAddedTerm": {
+          "type": "boolean"
+        },
+        "runNonMeasured": {
+          "type": "boolean"
+        }
+      }
+    },
+    "mergeArgs": {
+      "type": "object",
+      "properties": {
+        "sameMethodModel": {
+          "type": "boolean"
+        },
+        "skipSameTerm": {
+          "type": "boolean"
+        },
+        "replaceThreshold": {
+          "type": "array",
+          "minItems": 2,
+          "maxItems": 2,
+          "items": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "number"
+            }
+          ]
+        },
+        "replaceLowerTier": {
+          "type": "boolean"
+        },
+        "matchDatesFormat": {
+          "type": "string"
+        }
+      }
+    },
+    "model": {
+      "type": "object",
+      "properties": {
+        "key": {
+          "type": "string"
+        },
+        "model": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string"
+        },
+        "runStrategy": {
+          "type": "string",
+          "enum": ["add_blank_node_if_missing", "add_key_if_missing", "always"]
+        },
+        "runArgs": {
+          "$ref": "#/definitions/runArgs"
+        },
+        "mergeStrategy": {
+          "type": "string",
+          "enum": ["default", "list", "node", "append"]
+        },
+        "mergeArgs": {
+          "$ref": "#/definitions/mergeArgs"
+        },
+        "stage": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2
+        }
+      },
+      "required": ["key", "model", "runStrategy", "mergeStrategy"]
+    },
+    "model-list": {
+      "anyOf": [
+        { "$ref": "#/definitions/model" },
+        {
+          "type": "array",
+          "items": { "$ref": "#/definitions/model" }
+        }
+      ]
+    }
+  },
+  "properties": {
+    "models": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/model-list"
+      }
+    }
+  },
+  "required": ["models"]
+}

package/esm/validate-config.d.ts

@@ -1,11 +1,126 @@
-import { allowedType, IOrchestratorModelConfig } from './config';
+import { allowedType, IOrchestratorConfig, IOrchestratorModelConfig } from './config';
+/**
+ * JSON Schema (draft-07) describing an orchestrator configuration file.
+ * Note: it uses no external `$ref` and no `format` keyword, so it compiles with any ajv version.
+ */
+export declare const configSchema: {
+    $schema: string;
+    type: string;
+    definitions: {
+        runArgs: {
+            type: string;
+            properties: {
+                skipEmptyValue: {
+                    type: string;
+                };
+                skipAggregated: {
+                    type: string;
+                };
+                termId: {
+                    type: string;
+                };
+                runNonAddedTerm: {
+                    type: string;
+                };
+                runNonMeasured: {
+                    type: string;
+                };
+            };
+        };
+        mergeArgs: {
+            type: string;
+            properties: {
+                sameMethodModel: {
+                    type: string;
+                };
+                skipSameTerm: {
+                    type: string;
+                };
+                replaceThreshold: {
+                    type: string;
+                    minItems: number;
+                    maxItems: number;
+                    items: {
+                        type: string;
+                    }[];
+                };
+                replaceLowerTier: {
+                    type: string;
+                };
+                matchDatesFormat: {
+                    type: string;
+                };
+            };
+        };
+        model: {
+            type: string;
+            properties: {
+                key: {
+                    type: string;
+                };
+                model: {
+                    type: string;
+                };
+                value: {
+                    type: string;
+                };
+                runStrategy: {
+                    type: string;
+                    enum: string[];
+                };
+                runArgs: {
+                    $ref: string;
+                };
+                mergeStrategy: {
+                    type: string;
+                    enum: string[];
+                };
+                mergeArgs: {
+                    $ref: string;
+                };
+                stage: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                };
+            };
+            required: string[];
+        };
+        "model-list": {
+            anyOf: ({
+                $ref: string;
+                type?: undefined;
+                items?: undefined;
+            } | {
+                type: string;
+                items: {
+                    $ref: string;
+                };
+                $ref?: undefined;
+            })[];
+        };
+    };
+    properties: {
+        models: {
+            type: string;
+            items: {
+                $ref: string;
+            };
+        };
+    };
+    required: string[];
+};
+/**
+ * Either a node type, in which case the bundled configuration is used, or a configuration to validate.
+ */
+export type configOrNodeType = allowedType | IOrchestratorConfig;
 /**
  * Use inter-dependencies to detect models that are in the wrong order.
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  * @returns List of models that have dependencies that could not be found prior to running.
  */
-export declare const validateConfigOrder: (nodeType: allowedType) => {
+export declare const validateConfigOrder: (config: configOrNodeType) => {
     model: IOrchestratorModelConfig;
     existing: string[];
     missing: string[];
@@ -14,6 +129,6 @@ export declare const validateConfigOrder: (nodeType: allowedType) => {
  * Detect multiple models running in parallel when they should not.
  * Note: we use the `mergeArgs` to handle special cases when multiple identical models CAN run in parallel
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  */
-export declare const validateConfigDuplicates: (nodeType: allowedType) => IOrchestratorModelConfig[];
+export declare const validateConfigDuplicates: (config: configOrNodeType) => IOrchestratorModelConfig[];

package/esm/validate-config.js

@@ -1,5 +1,12 @@
 import { loadConfig } from './config';
 import { findMatchingModelFromConfig } from './utils';
+import * as schema from '../config/config-schema.json';
+/**
+ * JSON Schema (draft-07) describing an orchestrator configuration file.
+ * Note: it uses no external `$ref` and no `format` keyword, so it compiles with any ajv version.
+ */
+export const configSchema = schema;
+const resolveConfig = (config) => typeof config === 'string' ? loadConfig(config) : config;
 // models not included in the links
 const skipModels = ['emissions.deleted', 'transformations'];
 const isHestiaResidueCyclicModel = ({ model, value }) => model === 'hestia' && (value === null || value === void 0 ? void 0 : value.startsWith('residue'));
@@ -34,13 +41,12 @@ const matchDependencies = (models) => (model) => {
 /**
  * Use inter-dependencies to detect models that are in the wrong order.
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  * @returns List of models that have dependencies that could not be found prior to running.
  */
-export const validateConfigOrder = (nodeType) => {
-    const config = loadConfig(nodeType);
+export const validateConfigOrder = (config) => {
     // flatten all models to process one by one, starting with the last one
-    const models = config.models.flat();
+    const models = resolveConfig(config).models.flat();
     const results = models.filter(includeModel).map(matchDependencies(models));
     return results.filter((r) => r.missing.length > 0);
 };
@@ -54,12 +60,11 @@ const findDuplicatedConfigs = (models) => {
  * Detect multiple models running in parallel when they should not.
  * Note: we use the `mergeArgs` to handle special cases when multiple identical models CAN run in parallel
  *
- * @param nodeType Cycle, Site, or ImpactAssessment
+ * @param config Cycle, Site, or ImpactAssessment to use the bundled configuration, or a configuration itself.
  */
-export const validateConfigDuplicates = (nodeType) => {
-    const config = loadConfig(nodeType);
-    const duplicates = config.models
-        .map((value) => (Array.isArray(value) ? findDuplicatedConfigs(value) : []))
+export const validateConfigDuplicates = (config) => {
+    const duplicates = resolveConfig(config)
+        .models.map((value) => Array.isArray(value) ? findDuplicatedConfigs(value) : [])
         .flat(2);
     return duplicates;
 };

package/esm/version.d.ts

@@ -1 +1 @@
-export declare const ENGINE_VERSION = "0.87.0";
+export declare const ENGINE_VERSION = "0.87.3";

package/esm/version.js

@@ -1 +1 @@
-export const ENGINE_VERSION = '0.87.0';
+export const ENGINE_VERSION = '0.87.3';

package/formulas/index.json

@@ -3404,22 +3404,22 @@
   ],
   "hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.md": [
     {
-      "formula": "NO_3 = F_{excreta} \\times Frac_{LEACH} \\times \\frac{62}{14}",
+      "formula": "NO_3 = (N_{prp} + N_{oem}) \\times \\frac{62}{14}",
       "bindings": [
         {
           "symbol": "NO_3",
-          "description": "nitrate leached to groundwater (kg NO<sub>3</sub>)",
+          "description": "total nitrate leached to groundwater (kg NO<sub>3</sub>)",
           "key": "value"
         },
         {
-          "symbol": "F_{excreta}",
-          "description": "nitrogen from animal excreta inputs (kg N)",
-          "key": "N_excreta"
+          "symbol": "N_{prp}",
+          "description": "nitrogen leached to groundwater from excreta left on pasture (kg NO<sub>3</sub>-N)",
+          "key": "n_prp"
         },
         {
-          "symbol": "Frac_{LEACH}",
-          "description": "fraction of nitrogen lost through leaching",
-          "key": "frac_leach"
+          "symbol": "N_{oem}",
+          "description": "nitrogen leached to groundwater from other excreta management systems (kg NO<sub>3</sub>-N)",
+          "key": "n_oem"
         },
         {
           "symbol": "\\frac{62}{14}",
@@ -3427,6 +3427,61 @@
           "constant": ""
         }
       ]
+    },
+    {
+      "formula": "N_{prp} = N_{excreta} \\times Frac_{LEACH} \\times Frac_{prp}",
+      "bindings": [
+        {
+          "symbol": "N_{prp}",
+          "description": "nitrogen leached to groundwater from excreta left on pasture (kg NO<sub>3</sub>-N)"
+        },
+        {
+          "symbol": "N_{excreta}",
+          "description": "nitrogen from animal excreta inputs (kg N)",
+          "key": "n_total"
+        },
+        {
+          "symbol": "Frac_{LEACH}",
+          "description": "fraction of nitrogen lost through leaching",
+          "key": "frachLeach"
+        },
+        {
+          "symbol": "Frac_{prp}",
+          "description": "fraction of animal excreta left on pasture",
+          "key": "frac_prp"
+        }
+      ]
+    },
+    {
+      "formula": "N_{oem} = \\frac{\\sum_{e=1}^{E} N_e \\times EF_e}{E} \\times Frac_{oem}",
+      "bindings": [
+        {
+          "symbol": "N_{oem}",
+          "description": "nitrogen leached to groundwater from other excreta management systems (kg NO<sub>3</sub>-N)"
+        },
+        {
+          "symbol": "E",
+          "description": "Number of excreta types",
+          "key": "n_excreta_types"
+        },
+        {
+          "symbol": "N_e",
+          "description": "nitrogen from animal excreta input $e$ (kg N)",
+          "key": "n_totals",
+          "column": "excreta_id"
+        },
+        {
+          "symbol": "EF_e",
+          "description": "emission factor for animal excreta input $e$ (kg NO<sub>3</sub>-N / kg N)",
+          "key": "average_emission_factors",
+          "column": "excreta_id"
+        },
+        {
+          "symbol": "Frac_{oem}",
+          "description": "fraction of animal excreta left on pasture",
+          "key": "frac_oem"
+        }
+      ]
     }
   ],
   "hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.md": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/engine-models",
-  "version": "0.87.0",
+  "version": "0.87.3",
   "description": "HESTIA Engine Models",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -38,7 +38,7 @@
     "test": "jest --coverage",
     "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:config": "ajv validate -s config/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:formula-coverage": "node scripts/formula-coverage.js",