@hestia-earth/engine-models 0.76.1 → 0.76.2

package/dist/validate-config.d.ts

@@ -1,6 +1,19 @@
 import { allowedType, IOrchestratorModelConfig } from './config';
-export declare const validateConfig: (nodeType: allowedType) => {
+/**
+ * Use inter-dependencies to detect models that are in the wrong order.
+ *
+ * @param nodeType Cycle, Site, or ImpactAssessment
+ * @returns List of models that have dependencies that could not be found prior to running.
+ */
+export declare const validateConfigOrder: (nodeType: allowedType) => {
     model: IOrchestratorModelConfig;
     existing: string[];
     missing: string[];
 }[];
+/**
+ * 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
+ */
+export declare const validateConfigDuplicates: (nodeType: allowedType) => IOrchestratorModelConfig[];

package/dist/validate-config.js

@@ -1,6 +1,42 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateConfig = void 0;
+exports.validateConfigDuplicates = exports.validateConfigOrder = void 0;
 var config_1 = require("./config");
 var utils_1 = require("./utils");
 // models not included in the links
@@ -46,11 +82,40 @@ var matchDependencies = function (models) { return function (model) {
         })) !== null && _c !== void 0 ? _c : []
     };
 }; };
-var validateConfig = function (nodeType) {
+/**
+ * Use inter-dependencies to detect models that are in the wrong order.
+ *
+ * @param nodeType Cycle, Site, or ImpactAssessment
+ * @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);
     // flatten all models to process one by one, starting with the last one
     var models = config.models.flat();
     var results = models.filter(includeModel).map(matchDependencies(models));
     return results.filter(function (r) { return r.missing.length > 0; });
 };
-exports.validateConfig = validateConfig;
+exports.validateConfigOrder = validateConfigOrder;
+var findDuplicatedConfigs = function (models) {
+    var modelsByValue = models.reduce(function (prev, curr) {
+        var _a;
+        return (__assign(__assign({}, prev), (_a = {}, _a[curr.value] = __spreadArray(__spreadArray([], __read((prev[curr.value] || [])), false), [curr], false), _a)));
+    }, {});
+    return Object.values(modelsByValue)
+        .map(function (values) { return values.filter(function (v) { var _a; return !((_a = v.mergeArgs) === null || _a === void 0 ? void 0 : _a.sameMethodModel); }); })
+        .filter(function (values) { return values.length > 1; });
+};
+/**
+ * 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
+ */
+var validateConfigDuplicates = function (nodeType) {
+    var config = (0, config_1.loadConfig)(nodeType);
+    var duplicates = config.models
+        .map(function (value) { return (Array.isArray(value) ? findDuplicatedConfigs(value) : []); })
+        .flat(2);
+    return duplicates;
+};
+exports.validateConfigDuplicates = validateConfigDuplicates;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const ENGINE_VERSION = "0.76.1";
+export declare const ENGINE_VERSION = "0.76.2";

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.76.1';
+exports.ENGINE_VERSION = '0.76.2';