@hestia-earth/engine-models 0.65.9 → 0.65.11

package/src/config.spec.ts

@@ -1,7 +1,12 @@
 import { describe, expect, test } from '@jest/globals';
 import { NodeType } from '@hestia-earth/schema';
 
-import { loadConfig, loadRunConfig, loadTriggerConfig } from './config';
+import {
+  loadConfig,
+  loadRunConfig,
+  loadTriggerConfig,
+  getMaxStage
+} from './config';
 
 describe('config', () => {
   describe('loadConfig', () => {
@@ -64,4 +69,20 @@ describe('config', () => {
       );
     });
   });
+
+  describe('getMaxStage', () => {
+    test('existing config', () => {
+      expect(getMaxStage(NodeType.Cycle)).toEqual(2);
+      expect(getMaxStage(NodeType.Site)).toEqual(2);
+      expect(getMaxStage(NodeType.ImpactAssessment)).toEqual(1);
+    });
+
+    test('non-existing config', () => {
+      const t = () => getMaxStage('unknown' as any);
+
+      expect(t).toThrowError(
+        'Invalid type unknown. Allowed types: Cycle, Site, ImpactAssessment'
+      );
+    });
+  });
 });

package/src/config.ts

@@ -1,4 +1,9 @@
 import { NodeType } from '@hestia-earth/schema';
+import * as runConfig from '../config/run-calculations.json';
+import * as triggerConfig from '../config/trigger-calculations.json';
+import * as Cycle from '../config/Cycle.json';
+import * as ImpactAssessment from '../config/ImpactAssessment.json';
+import * as Site from '../config/Site.json';
 
 export interface IOrchestratorModelConfig {
   key: string;
@@ -29,14 +34,22 @@ const validateType = (nodeType: any) =>
     );
   })();
 
+const typeToConfig: {
+  [type in NodeType]?: IOrchestratorConfig;
+} = {
+  [NodeType.Cycle]: Cycle as IOrchestratorConfig,
+  [NodeType.ImpactAssessment]: ImpactAssessment as IOrchestratorConfig,
+  [NodeType.Site]: Site as IOrchestratorConfig
+};
+
 /**
  * Load orchestrator configuration.
  *
  * @param nodeType NodeType associated with configuration.
  * @returns
  */
-export const loadConfig = (nodeType: allowedType): IOrchestratorConfig =>
-  validateType(nodeType) && require(`../config/${nodeType}.json`);
+export const loadConfig = (nodeType: allowedType) =>
+  validateType(nodeType) && typeToConfig[nodeType];
 
 interface ICalculationConfigData {
   key: 'related' | 'nested';
@@ -67,16 +80,18 @@ const validateStage = (
 
 export const loadRunConfig = (nodeType: allowedType, stage: number) =>
   validateType(nodeType) &&
-  validateStage(
-    require('../config/run-calculations.json') as calculationConfig,
-    nodeType,
-    stage
-  );
+  validateStage(runConfig as calculationConfig, nodeType, stage);
 
 export const loadTriggerConfig = (nodeType: allowedType, stage: number) =>
   validateType(nodeType) &&
-  validateStage(
-    require('../config/trigger-calculations.json') as calculationConfig,
-    nodeType,
-    stage
-  );
+  validateStage(triggerConfig as calculationConfig, nodeType, stage);
+
+export const getMaxStage = (nodeType: allowedType) =>
+  validateType(nodeType)
+    ? Math.max.apply(
+        Math.max,
+        Object.keys((runConfig as calculationConfig)[nodeType]).map((key) =>
+          Number(key.replace('stage-', ''))
+        )
+      )
+    : null;

package/src/models.spec.ts

@@ -1,12 +1,11 @@
 import { describe, expect, test } from '@jest/globals';
 
-import { loadModels } from './models';
+import { models } from './models';
 
 describe('models', () => {
   describe('loadModels', () => {
-    test('load models', () => {
-      const { links } = loadModels();
-      expect(links?.length > 0).toBeTruthy();
+    test('has links', () => {
+      expect(models.links?.length > 0).toBeTruthy();
     });
   });
 });

package/src/models.ts

@@ -1,4 +1,5 @@
 import { EmissionMethodTier } from '@hestia-earth/schema';
+import * as data from '../model-links.json';
 
 export interface IModel {
   /**
@@ -33,4 +34,4 @@ export interface IModelLinks {
   ecoinventV3AndEmberClimateLinks?: IModel[];
 }
 
-export const loadModels = (): IModelLinks => require('../model-links.json');
+export const models = data as IModelLinks;

package/src/version.ts

@@ -1 +1 @@
-export const ENGINE_VERSION = '0.65.9';
+export const ENGINE_VERSION = '0.65.11';