@hestia-earth/engine-models 0.65.9 → 0.65.10

package/config/Cycle.json

@@ -609,15 +609,7 @@
         "stage": 2
       },
       {
-        "key": "inputs",
-        "model": "cycle",
-        "value": "energyContentLowerHeatingValue",
-        "runStrategy": "always",
-        "mergeStrategy": "list",
-        "stage": 2
-      },
-      {
-        "key": "products",
+        "key": "animals",
         "model": "cycle",
         "value": "milkYield",
         "runStrategy": "always",
@@ -625,6 +617,14 @@
         "stage": 2
       }
     ],
+    {
+      "key": "inputs",
+      "model": "cycle",
+      "value": "energyContentLowerHeatingValue",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "stage": 2
+    },
     {
       "key": "products",
       "model": "cycle",

package/config/Site.json

@@ -432,6 +432,24 @@
         "stage": 2
       }
     ],
+    [
+      {
+        "key": "defaultMethodClassification",
+        "model": "site",
+        "value": "defaultMethodClassification",
+        "runStrategy": "add_key_if_missing",
+        "mergeStrategy": "default",
+        "stage": 2
+      },
+      {
+        "key": "defaultMethodClassificationDescription",
+        "model": "site",
+        "value": "defaultMethodClassificationDescription",
+        "runStrategy": "add_key_if_missing",
+        "mergeStrategy": "default",
+        "stage": 2
+      }
+    ],
     [
       {
         "key": "measurements",

package/dist/config.d.ts

@@ -26,4 +26,5 @@ interface ICalculationConfigData {
 }
 export declare const loadRunConfig: (nodeType: allowedType, stage: number) => ICalculationConfigData[];
 export declare const loadTriggerConfig: (nodeType: allowedType, stage: number) => ICalculationConfigData[];
+export declare const getMaxStage: (nodeType: allowedType) => any;
 export {};

package/dist/config.js

@@ -1,7 +1,13 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTriggerConfig = exports.loadRunConfig = exports.loadConfig = void 0;
+exports.getMaxStage = exports.loadTriggerConfig = exports.loadRunConfig = exports.loadConfig = void 0;
 var schema_1 = require("@hestia-earth/schema");
+var runConfig = require("../config/run-calculations.json");
+var triggerConfig = require("../config/trigger-calculations.json");
+var Cycle = require("../config/Cycle.json");
+var ImpactAssessment = require("../config/ImpactAssessment.json");
+var Site = require("../config/Site.json");
 var allowedTypes = [schema_1.NodeType.Cycle, schema_1.NodeType.Site, schema_1.NodeType.ImpactAssessment];
 var validateType = function (nodeType) {
     return allowedTypes.includes(nodeType) ||
@@ -9,6 +15,11 @@ var validateType = function (nodeType) {
             throw new Error("Invalid type ".concat(nodeType, ". Allowed types: ").concat(allowedTypes.join(', ')));
         })();
 };
+var typeToConfig = (_a = {},
+    _a[schema_1.NodeType.Cycle] = Cycle,
+    _a[schema_1.NodeType.ImpactAssessment] = ImpactAssessment,
+    _a[schema_1.NodeType.Site] = Site,
+    _a);
 /**
  * Load orchestrator configuration.
  *
@@ -16,7 +27,7 @@ var validateType = function (nodeType) {
  * @returns
  */
 var loadConfig = function (nodeType) {
-    return validateType(nodeType) && require("../config/".concat(nodeType, ".json"));
+    return validateType(nodeType) && typeToConfig[nodeType];
 };
 exports.loadConfig = loadConfig;
 var validateStage = function (config, nodeType, stage) {
@@ -28,11 +39,19 @@ var validateStage = function (config, nodeType, stage) {
 };
 var loadRunConfig = function (nodeType, stage) {
     return validateType(nodeType) &&
-        validateStage(require('../config/run-calculations.json'), nodeType, stage);
+        validateStage(runConfig, nodeType, stage);
 };
 exports.loadRunConfig = loadRunConfig;
 var loadTriggerConfig = function (nodeType, stage) {
     return validateType(nodeType) &&
-        validateStage(require('../config/trigger-calculations.json'), nodeType, stage);
+        validateStage(triggerConfig, nodeType, stage);
 };
 exports.loadTriggerConfig = loadTriggerConfig;
+var getMaxStage = function (nodeType) {
+    return validateType(nodeType)
+        ? Math.max.apply(Math.max, Object.keys(runConfig[nodeType]).map(function (key) {
+            return Number(key.replace('stage-', ''));
+        }))
+        : null;
+};
+exports.getMaxStage = getMaxStage;

package/dist/models.d.ts

@@ -30,4 +30,4 @@ export interface IModelLinks {
     ecoinventLinks?: IModel[];
     ecoinventV3AndEmberClimateLinks?: IModel[];
 }
-export declare const loadModels: () => IModelLinks;
+export declare const models: IModelLinks;

package/dist/models.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadModels = void 0;
-var loadModels = function () { return require('../model-links.json'); };
-exports.loadModels = loadModels;
+exports.models = void 0;
+var data = require("../model-links.json");
+exports.models = data;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const ENGINE_VERSION = "0.65.9";
+export declare const ENGINE_VERSION = "0.65.10";

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.65.9';
+exports.ENGINE_VERSION = '0.65.10';

package/model-links.json

@@ -2464,6 +2464,18 @@
       "model": "site",
       "term": "cationExchangeCapacityPerKgSoil"
     },
+    {
+      "path": "hestia_earth/models/site/defaultMethodClassification.py",
+      "docPath": "hestia_earth/models/site/defaultMethodClassification.md",
+      "model": "site",
+      "modelKey": "defaultMethodClassification"
+    },
+    {
+      "path": "hestia_earth/models/site/defaultMethodClassificationDescription.py",
+      "docPath": "hestia_earth/models/site/defaultMethodClassificationDescription.md",
+      "model": "site",
+      "modelKey": "defaultMethodClassificationDescription"
+    },
     {
       "path": "hestia_earth/models/site/flowingWater.py",
       "docPath": "hestia_earth/models/site/flowingWater.md",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/engine-models",
-  "version": "0.65.9",
+  "version": "0.65.10",
   "description": "HESTIA Engine Models",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -51,9 +51,9 @@
     "@hestia-earth/api": "^0.24.34",
     "@hestia-earth/eslint-config": "^0.1.0",
     "@hestia-earth/glossary": "^0.62.0",
-    "@hestia-earth/json-schema": "^30.5.0",
-    "@hestia-earth/schema": "^30.5.0",
-    "@hestia-earth/schema-validation": "^30.5.0",
+    "@hestia-earth/json-schema": "^30.6.0",
+    "@hestia-earth/schema": "^30.6.0",
+    "@hestia-earth/schema-validation": "^30.6.0",
     "@hestia-earth/utils": "^0.13.0",
     "@jest/globals": "^29.7.0",
     "@typescript-eslint/eslint-plugin": "^5.23.0",