@powercalc/power-router 1.0.25 → 1.0.28

package/dist/app.js

@@ -1,25 +1,20 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("reflect-metadata");
+import 'reflect-metadata';
 process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0';
-const express_1 = __importDefault(require("express"));
-const cors_1 = __importDefault(require("cors"));
-const path_1 = require("path");
-const process_1 = require("process");
-const Router_1 = require("./router/controllers/Router");
-const app = (0, express_1.default)();
+import express from 'express';
+import cors from 'cors';
+import { join } from 'path';
+import { cwd } from 'process';
+import { PowerRouter } from './router/controllers/Router';
+const app = express();
 const port = 30000;
 const config = {
     securityToken: '1c608639-afff-4d73-bfe1-a960fe7ea8da',
-    cacheDir: (0, path_1.join)((0, process_1.cwd)(), 'data'),
+    cacheDir: join(cwd(), 'data'),
     entsoeDomain: "https://web-api.tp.entsoe.eu"
 };
-app.use((0, cors_1.default)());
-app.use('/entsoe', Router_1.PowerRouter.init(config));
-app.use('/public', express_1.default.static('public'));
+app.use(cors());
+app.use('/entsoe', PowerRouter.init(config));
+app.use('/public', express.static('public'));
 // app.use('/config', express.static('dist/config', { maxAge: 100000 }));
 app.listen(port, () => {
     console.log(`Server listening on port ${port}`);

package/dist/converter.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,21 +7,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Convert = void 0;
-const genTypes_1 = require("./genTypes");
-const maxHydrofill_1 = require("./router/services/batch/maxHydrofill");
-const promises_1 = require("node:fs/promises");
-class Convert {
+import { GenTypes } from "./genTypes";
+import { Hydrofill } from "./router/services/batch/maxHydrofill";
+import { writeFile } from 'node:fs/promises';
+export class Convert {
     static start() {
         return __awaiter(this, void 0, void 0, function* () {
             const countries = yield this.getCountries();
             console.log(countries);
             for (const country of countries) {
-                const types = yield genTypes_1.GenTypes.getTypes(country.code);
+                const types = yield GenTypes.getTypes(country.code);
                 country.types = types;
                 console.log(country.name, types.join(', '));
-                const h = yield maxHydrofill_1.Hydrofill.getMaxHydrofill(country.code);
+                const h = yield Hydrofill.getMaxHydrofill(country.code);
                 if (h.max) {
                     const GW = Math.round(h.max / 1000) + ' GW';
                     console.log(country.name, GW);
@@ -37,7 +34,7 @@ class Convert {
                 const hydrofill = yield this.getHydrofill(country.code);
             }
             console.log(countries);
-            (0, promises_1.writeFile)('data/countrydata.json', JSON.stringify(countries, null, 2), 'utf-8');
+            writeFile('data/countrydata.json', JSON.stringify(countries, null, 2), 'utf-8');
         });
     }
     static getCountries() {
@@ -76,5 +73,4 @@ class Convert {
         });
     }
 }
-exports.Convert = Convert;
 Convert.start();

package/dist/genTypes.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,12 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenTypes = void 0;
-const node_zlib_1 = require("node:zlib");
-const load_1 = require("./load");
-const promises_1 = require("node:fs/promises");
-class GenTypes {
+import { gzip } from "node:zlib";
+import { Load } from "./load";
+import { writeFile } from 'node:fs/promises';
+export class GenTypes {
     static getTypes(country) {
         return __awaiter(this, void 0, void 0, function* () {
             let types = [];
@@ -23,20 +20,20 @@ class GenTypes {
             let max;
             for (let year = minYear; year <= maxYear; year++) {
                 for (let month = 1; month <= 12; month++) {
-                    const gen = yield load_1.Load.getGeneration(country, year, month);
-                    const price = yield load_1.Load.getPrice(country, year, month);
-                    const load = yield load_1.Load.getLoad(country, year, month);
+                    const gen = yield Load.getGeneration(country, year, month);
+                    const price = yield Load.getPrice(country, year, month);
+                    const load = yield Load.getLoad(country, year, month);
                     const all = this.makeGen(gen, load, price);
                     const gzipfilename = `data/gzip/${country}-${year}-${month}.json.gzip`;
                     const filename = `data/generation/${country}-${year}-${month}.json`;
                     const buf = Buffer.from(JSON.stringify(all), 'utf-8');
-                    (0, node_zlib_1.gzip)(buf, (_, result) => __awaiter(this, void 0, void 0, function* () {
+                    gzip(buf, (_, result) => __awaiter(this, void 0, void 0, function* () {
                         var _a;
-                        yield (0, promises_1.writeFile)(gzipfilename, result, 'utf-8');
+                        yield writeFile(gzipfilename, result, 'utf-8');
                         // console.log(gen.dataset.map((item:any) => item.label))
                         types = types.concat(((_a = gen.dataset) === null || _a === void 0 ? void 0 : _a.map((item) => item.psrType)) || []);
                     }));
-                    yield (0, promises_1.writeFile)(filename, JSON.stringify(all, null, 2), 'utf-8');
+                    yield writeFile(filename, JSON.stringify(all, null, 2), 'utf-8');
                 }
             }
             return [...new Set(types)].sort();
@@ -61,4 +58,3 @@ class GenTypes {
         return all;
     }
 }
-exports.GenTypes = GenTypes;

package/dist/index.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PowerRouter = void 0;
-const Router_1 = require("./router/controllers/Router");
-Object.defineProperty(exports, "PowerRouter", { enumerable: true, get: function () { return Router_1.PowerRouter; } });
+import { PowerRouter } from './router/controllers/Router';
+export { PowerRouter };

package/dist/load.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,9 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Load = void 0;
-class Load {
+export class Load {
     static getCountries() {
         return __awaiter(this, void 0, void 0, function* () {
             const url = 'https://powercalculator.eu/entsoe/datalists/countries';
@@ -47,4 +44,3 @@ class Load {
         });
     }
 }
-exports.Load = Load;

package/dist/router/controllers/LoadAndParse.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,18 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadAndParse = void 0;
-const path_1 = require("path");
-const fs_1 = require("fs");
-const LoadService_1 = require("../services/LoadService");
-const queryoptions_1 = require("../interfaces/queryoptions");
-class LoadAndParse {
+import { join } from 'path';
+import { readFileSync } from 'fs';
+import { LoadService } from '../services/LoadService';
+import { Format, PosNeg } from '../interfaces/queryoptions';
+export class LoadAndParse {
     constructor(config) {
         this.country = '';
-        const countriesFile = (0, path_1.join)(__dirname, '../config/countries.json'); // Set the path to your config file
-        this.countries = JSON.parse((0, fs_1.readFileSync)(countriesFile, 'utf8')); // Read the config file from disk
-        this.loadService = new LoadService_1.LoadService(config);
+        const countriesFile = join(__dirname, '../config/countries.json'); // Set the path to your config file
+        this.countries = JSON.parse(readFileSync(countriesFile, 'utf8')); // Read the config file from disk
+        this.loadService = new LoadService(config);
     }
     get(req, chartType) {
         var _a;
@@ -32,10 +29,10 @@ class LoadAndParse {
             const queryOptions = {};
             const year = parseInt(req.params.year);
             const month = parseInt(req.params.month);
-            if (req.query.posneg === queryoptions_1.PosNeg.POS || req.query.posneg === queryoptions_1.PosNeg.NEG) {
+            if (req.query.posneg === PosNeg.POS || req.query.posneg === PosNeg.NEG) {
                 queryOptions.posneg = req.query.posneg;
             }
-            if (typeof (req.query.format) === 'string' && Object.values(queryoptions_1.Format).includes(req.query.format)) {
+            if (typeof (req.query.format) === 'string' && Object.values(Format).includes(req.query.format)) {
                 queryOptions.format = req.query.format;
             }
             let reload = false;
@@ -65,4 +62,3 @@ class LoadAndParse {
         });
     }
 }
-exports.LoadAndParse = LoadAndParse;

package/dist/router/controllers/Router.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,20 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PowerRouter = void 0;
-const express_1 = require("express");
-const crypto_1 = require("crypto");
-const promises_1 = require("fs/promises");
-const zlib_1 = require("zlib");
-const node_buffer_1 = require("node:buffer");
-const fs_1 = require("fs");
-const LoadAndParse_1 = require("./LoadAndParse");
-const path_1 = require("path");
-class PowerRouter {
+import { Router } from 'express';
+import { createHash } from 'crypto';
+import { stat, writeFile } from 'fs/promises';
+import { gzipSync } from 'zlib';
+import { Buffer } from 'node:buffer';
+import { createReadStream } from 'fs';
+import { LoadAndParse } from './LoadAndParse';
+import { join } from 'path';
+export class PowerRouter {
     static init(config) {
         console.log('init', config);
-        const router = (0, express_1.Router)();
+        const router = Router();
         router.get(`/:country/:year/:month`, (req, res) => __awaiter(this, void 0, void 0, function* () {
             yield this.load(config, req, res, 'power');
         }));
@@ -38,12 +35,12 @@ class PowerRouter {
             yield this.load(config, req, res, 'countrydata');
         }));
         router.get('/types', (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const filePath = (0, path_1.join)(__dirname, '..', 'config', 'types.json');
+            const filePath = join(__dirname, '..', 'config', 'types.json');
             res.set({ 'Cache-Control': 'max-age=86400' });
             res.sendFile(filePath);
         }));
         router.get('/countries', (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const filePath = (0, path_1.join)(__dirname, '..', 'config', 'countrydata.json');
+            const filePath = join(__dirname, '..', 'config', 'countrydata.json');
             res.set({ 'Cache-Control': 'max-age=86400' });
             res.sendFile(filePath);
         }));
@@ -51,7 +48,7 @@ class PowerRouter {
     }
     static load(config, req, res, type) {
         return __awaiter(this, void 0, void 0, function* () {
-            const entsoeLoader = new LoadAndParse_1.LoadAndParse(config);
+            const entsoeLoader = new LoadAndParse(config);
             const cacheTime = this.calcCacheTime(req);
             const successHeaders = {
                 'Cache-Control': `public, max-age=${cacheTime}`,
@@ -61,11 +58,11 @@ class PowerRouter {
             try {
                 let cacheData;
                 const cacheKey = req.url;
-                const cacheFilePath = `${config.cacheDir}/${(0, crypto_1.createHash)('md5').update(cacheKey).digest('hex')}.json.gz`;
+                const cacheFilePath = `${config.cacheDir}/${createHash('md5').update(cacheKey).digest('hex')}.json.gz`;
                 if (!(req.headers['reload'] === 'full')) {
                     // check if there is a cache file for this request
                     try {
-                        const stats = yield (0, promises_1.stat)(cacheFilePath);
+                        const stats = yield stat(cacheFilePath);
                         const modtime = stats.mtime.getTime();
                         // Check if the If-Modified-Since header matches the last modified date
                         const ifModifiedSince = req.headers['if-modified-since'];
@@ -76,7 +73,7 @@ class PowerRouter {
                         res.setHeader('Last-Modified', (new Date(modtime)).toUTCString());
                         res.set(successHeaders);
                         console.log('cached');
-                        (0, fs_1.createReadStream)(cacheFilePath)
+                        createReadStream(cacheFilePath)
                             .pipe(res);
                         return;
                     }
@@ -88,9 +85,9 @@ class PowerRouter {
                 if (!cacheData) {
                     // LOAD THE DATA  FROM SOURCE
                     const body = yield entsoeLoader.get(req, type);
-                    const buf = node_buffer_1.Buffer.from(JSON.stringify(body), 'utf-8');
-                    const cacheDataBuffer = (0, zlib_1.gzipSync)(buf);
-                    yield (0, promises_1.writeFile)(cacheFilePath, cacheDataBuffer, 'utf-8');
+                    const buf = Buffer.from(JSON.stringify(body), 'utf-8');
+                    const cacheDataBuffer = gzipSync(buf);
+                    yield writeFile(cacheFilePath, cacheDataBuffer, 'utf-8');
                     res.setHeader('Last-Modified', (new Date()).toUTCString());
                     res.set(successHeaders);
                     res.send(cacheDataBuffer);
@@ -113,4 +110,3 @@ class PowerRouter {
         }
     }
 }
-exports.PowerRouter = PowerRouter;

package/dist/router/index.js

@@ -1,5 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PowerRouter = void 0;
-var Router_1 = require("./controllers/Router");
-Object.defineProperty(exports, "PowerRouter", { enumerable: true, get: function () { return Router_1.PowerRouter; } });
+export { PowerRouter } from './controllers/Router';

package/dist/router/interfaces/config.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/router/interfaces/entsoe.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/router/interfaces/queryoptions.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PosNeg = exports.Format = void 0;
-var Format;
+export var Format;
 (function (Format) {
     Format["EDIFACT"] = "edifact";
     Format["EDIJSON"] = "edijson";
     Format["SOURCES"] = "sources";
     Format["KEYVALUE"] = "keyvalue";
-})(Format = exports.Format || (exports.Format = {}));
-var PosNeg;
+})(Format || (Format = {}));
+export var PosNeg;
 (function (PosNeg) {
     PosNeg["POS"] = "pos";
     PosNeg["NEG"] = "neg";
-})(PosNeg = exports.PosNeg || (exports.PosNeg = {}));
+})(PosNeg || (PosNeg = {}));

package/dist/router/interfaces/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/router/services/CommonTimestamps.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonTimestamps = void 0;
-const luxon_1 = require("luxon");
-class CommonTimestamps {
+import { DateTime, Duration } from "luxon";
+export class CommonTimestamps {
     static transform(all, startMonth, endMonth) {
         const best = this.bestResolution(all);
         const time = this.makeTimeArray(startMonth, endMonth, best);
@@ -58,7 +55,7 @@ class CommonTimestamps {
     }
     static interpolate(all, newTimes) {
         const best = this.best(all);
-        const dur = luxon_1.Duration.fromISO(best).as('milliseconds');
+        const dur = Duration.fromISO(best).as('milliseconds');
         const data = all[best];
         const sourceTimes = data.map(item => item.time);
         /*
@@ -120,9 +117,9 @@ class CommonTimestamps {
         return result;
     }
     static makeTimeArray(startIsoString, endIsoString, resolution) {
-        const duration = luxon_1.Duration.fromISO(resolution).toMillis();
-        const localStartTime = luxon_1.DateTime.fromISO(startIsoString);
-        const localEndTime = luxon_1.DateTime.fromISO(endIsoString);
+        const duration = Duration.fromISO(resolution).toMillis();
+        const localStartTime = DateTime.fromISO(startIsoString);
+        const localEndTime = DateTime.fromISO(endIsoString);
         // Convert start and end time to UTC time using Luxon
         const utcStartTime = localStartTime.toUTC();
         const utcEndTime = localEndTime.toUTC();
@@ -147,7 +144,7 @@ class CommonTimestamps {
         let minPeriod = '';
         const keys = Object.keys(all);
         keys.forEach(period => {
-            const dur = luxon_1.Duration.fromISO(period);
+            const dur = Duration.fromISO(period);
             if (dur.as('minutes') < min) {
                 min = dur.as('minutes');
                 minPeriod = period;
@@ -160,7 +157,7 @@ class CommonTimestamps {
         let minPeriod = '';
         Object.keys(all).forEach((key) => {
             Object.keys(all[key]).forEach(period => {
-                const dur = luxon_1.Duration.fromISO(period);
+                const dur = Duration.fromISO(period);
                 if (dur.as('minutes') < min) {
                     min = dur.as('minutes');
                     minPeriod = period;
@@ -170,4 +167,3 @@ class CommonTimestamps {
         return minPeriod;
     }
 }
-exports.CommonTimestamps = CommonTimestamps;

package/dist/router/services/Eurostat.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,12 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EurostatAPI = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
+import { readFileSync } from "fs";
+import { join } from "path";
 process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0';
-class EurostatAPI {
+export class EurostatAPI {
     constructor() {
         this.countries = [];
         this.fuels = {
@@ -28,8 +25,8 @@ class EurostatAPI {
             ['TJ_GCV', Math.pow(10, 12)],
             ['THS_T', 41868000000000], // joules per thousand metric tons of oil equivalent
         ]);
-        const countryPath = (0, path_1.join)(__dirname, '..', 'config/countries.json');
-        const countriesString = (0, fs_1.readFileSync)(countryPath, 'utf-8');
+        const countryPath = join(__dirname, '..', 'config/countries.json');
+        const countriesString = readFileSync(countryPath, 'utf-8');
         this.countries = JSON.parse(countriesString);
     }
     convertToMWh(value, unit) {
@@ -82,4 +79,3 @@ class EurostatAPI {
         });
     }
 }
-exports.EurostatAPI = EurostatAPI;

package/dist/router/services/LoadService.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,43 +7,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadService = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const Loader_1 = require("./Loader");
-const ParseEdifact_1 = require("./ParseEdifact");
-const ParseInstalled_1 = require("./ParseInstalled");
-const CommonTimestamps_1 = require("./CommonTimestamps");
-const Eurostat_1 = require("./Eurostat");
-const queryoptions_1 = require("../interfaces/queryoptions");
-class LoadService {
+import { readFileSync } from "fs";
+import { join } from "path";
+import { EntsoeLoader } from "./Loader";
+import { EdifactParser } from "./ParseEdifact";
+import { ParseInstalled } from "./ParseInstalled";
+import { CommonTimestamps } from "./CommonTimestamps";
+import { EurostatAPI } from "./Eurostat";
+import { Format } from "../interfaces/queryoptions";
+export class LoadService {
     constructor(loaderConfig) {
         this.loaderConfig = loaderConfig;
         this.country = '';
-        const typesPath = (0, path_1.join)(__dirname, '../config/types.json'); // Set the path to your config file
-        const types = JSON.parse((0, fs_1.readFileSync)(typesPath, 'utf8')); // Read the config file from disk
-        this.loader = new Loader_1.EntsoeLoader(loaderConfig);
-        this.parser = new ParseEdifact_1.EdifactParser(types);
-        this.parseInstalled = new ParseInstalled_1.ParseInstalled(types);
+        const typesPath = join(__dirname, '../config/types.json'); // Set the path to your config file
+        const types = JSON.parse(readFileSync(typesPath, 'utf8')); // Read the config file from disk
+        this.loader = new EntsoeLoader(loaderConfig);
+        this.parser = new EdifactParser(types);
+        this.parseInstalled = new ParseInstalled(types);
     }
     getPower(countryCode, year, month, queryOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             const wanted = ['generation', 'price', 'consumption'];
-            if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === queryoptions_1.Format.SOURCES) {
+            if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === Format.SOURCES) {
                 return this.loader.makeUrls(wanted, countryCode, year, month);
             }
             const edifactAsJson = yield this.loader.load(wanted, countryCode, year, month, queryOptions);
-            if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === queryoptions_1.Format.EDIJSON) {
+            if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === Format.EDIJSON) {
                 return edifactAsJson;
             }
             const parsed = yield this.parser.parseAll(edifactAsJson);
-            if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === queryoptions_1.Format.KEYVALUE) {
+            if ((queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.format) === Format.KEYVALUE) {
                 return parsed;
             }
             const startMonth = (new Date(Date.UTC(year, month - 1))).toISOString();
             const endMonth = (new Date(Date.UTC(year, month))).toISOString();
-            const ready = CommonTimestamps_1.CommonTimestamps.transform(parsed, startMonth, endMonth);
+            const ready = CommonTimestamps.transform(parsed, startMonth, endMonth);
             return ready;
         });
     }
@@ -83,7 +80,7 @@ class LoadService {
     }
     getFossil(country) {
         return __awaiter(this, void 0, void 0, function* () {
-            const eurostat = new Eurostat_1.EurostatAPI();
+            const eurostat = new EurostatAPI();
             return yield eurostat.load(country);
         });
     }
@@ -98,4 +95,3 @@ class LoadService {
         });
     }
 }
-exports.LoadService = LoadService;

package/dist/router/services/Loader.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,13 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntsoeLoader = void 0;
-const xml2js_1 = require("xml2js");
-const promises_1 = require("node:fs/promises");
-const node_path_1 = require("node:path");
-const date_fns_1 = require("date-fns");
-class EntsoeLoader {
+import { parseStringPromise } from 'xml2js';
+import { readFile, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { add, format, sub } from 'date-fns';
+export class EntsoeLoader {
     constructor(loaderConfig) {
         this.loaderConfig = loaderConfig;
         this.config = loaderConfig;
@@ -34,14 +31,14 @@ class EntsoeLoader {
     }
     makeUrls(wanted, countryCode, year, month) {
         let start = new Date(Date.UTC(year, month - 1));
-        start = (0, date_fns_1.sub)(start, { hours: 3 });
+        start = sub(start, { hours: 3 });
         let end = new Date(Date.UTC(year, month));
-        end = (0, date_fns_1.add)(end, { hours: 3 });
-        const periodStart = (0, date_fns_1.format)(start, 'yyyyMMddHHmm');
-        const periodEnd = (0, date_fns_1.format)(end, 'yyyyMMddHHmm');
-        const hydroStart = (0, date_fns_1.sub)(start, { days: 7 });
-        const hydroPeriodStart = (0, date_fns_1.format)(hydroStart, 'yyyyMMddHHmm');
-        const hydroPeriodEnd = (0, date_fns_1.format)((0, date_fns_1.add)(hydroStart, { days: 380 }), 'yyyyMMddHHmm');
+        end = add(end, { hours: 3 });
+        const periodStart = format(start, 'yyyyMMddHHmm');
+        const periodEnd = format(end, 'yyyyMMddHHmm');
+        const hydroStart = sub(start, { days: 7 });
+        const hydroPeriodStart = format(hydroStart, 'yyyyMMddHHmm');
+        const hydroPeriodEnd = format(add(hydroStart, { days: 380 }), 'yyyyMMddHHmm');
         let priceCountryCode = countryCode;
         //germany luxemburg
         if (countryCode === '10Y1001A1001A83F' || countryCode === '10YLU-CEGEDEL-NQ') {
@@ -104,13 +101,13 @@ class EntsoeLoader {
             const simpleUrl = url.replace(/[\W_]+/g, "_");
             let filename;
             if (this.config.cacheDir) {
-                filename = (0, node_path_1.join)(this.config.cacheDir, simpleUrl + '.json');
+                filename = join(this.config.cacheDir, simpleUrl + '.json');
             }
             try {
                 if (reload || !filename) {
                     throw Error('go for full reload');
                 }
-                const jsonString = yield (0, promises_1.readFile)(filename, 'utf-8');
+                const jsonString = yield readFile(filename, 'utf-8');
                 return JSON.parse(jsonString);
             }
             catch (e) {
@@ -120,9 +117,9 @@ class EntsoeLoader {
                     return Promise.reject(new Error(`${response.status} ${response.statusText}`));
                 }
                 const data = yield response.text();
-                const json = yield (0, xml2js_1.parseStringPromise)(data);
+                const json = yield parseStringPromise(data);
                 if (filename) {
-                    (0, promises_1.writeFile)(filename, JSON.stringify(json), 'utf-8');
+                    writeFile(filename, JSON.stringify(json), 'utf-8');
                 }
                 return json;
             }
@@ -135,4 +132,3 @@ class EntsoeLoader {
         }, {});
     }
 }
-exports.EntsoeLoader = EntsoeLoader;

package/dist/router/services/ParseEdifact.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EdifactParser = void 0;
-const luxon_1 = require("luxon");
-class EdifactParser {
+import { DateTime, Duration } from "luxon";
+export class EdifactParser {
     constructor(types) {
         this.types = types;
         this.psrName = {};
@@ -84,9 +81,9 @@ class EdifactParser {
         return [startEndResolution.resolution, result];
     }
     makeTimeArray(startIsoString, endIsoString, resolution, timeSerie) {
-        const duration = luxon_1.Duration.fromISO(resolution).toMillis();
-        const localStartTime = luxon_1.DateTime.fromISO(startIsoString);
-        const localEndTime = luxon_1.DateTime.fromISO(endIsoString);
+        const duration = Duration.fromISO(resolution).toMillis();
+        const localStartTime = DateTime.fromISO(startIsoString);
+        const localEndTime = DateTime.fromISO(endIsoString);
         // Convert start and end time to UTC time using Luxon
         const utcStartTime = localStartTime.toUTC();
         const utcEndTime = localEndTime.toUTC();
@@ -156,4 +153,3 @@ class EdifactParser {
         return result;
     }
 }
-exports.EdifactParser = EdifactParser;

package/dist/router/services/ParseInstalled.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParseInstalled = void 0;
-class ParseInstalled {
+export class ParseInstalled {
     constructor(types) {
         this.types = types;
         this.psrName = {};
@@ -42,4 +39,3 @@ class ParseInstalled {
         return (_a = timeSeries === null || timeSeries === void 0 ? void 0 : timeSeries.MktPSRType) === null || _a === void 0 ? void 0 : _a[0].psrType;
     }
 }
-exports.ParseInstalled = ParseInstalled;

package/dist/router/services/batch/maxHydrofill.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,14 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hydrofill = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const process_1 = require("process");
+import { readFileSync, writeFileSync } from "fs";
+import { join } from "path";
+import { cwd } from "process";
 //import { EntsoeLoader } from "../Loader";
 process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0';
-class Hydrofill {
+export class Hydrofill {
     static start() {
         return __awaiter(this, void 0, void 0, function* () {
             const countries = yield this.getCountries();
@@ -30,10 +27,10 @@ class Hydrofill {
                     };
                 }
             }
-            const countryFile = (0, path_1.join)(__dirname, '../../config', 'countrydata.json');
+            const countryFile = join(__dirname, '../../config', 'countrydata.json');
             console.log(countryFile);
-            const countryDataFile = (0, path_1.join)((0, process_1.cwd)(), 'data/countrydata.json');
-            (0, fs_1.writeFileSync)(countryFile, JSON.stringify(countries, null, 2));
+            const countryDataFile = join(cwd(), 'data/countrydata.json');
+            writeFileSync(countryFile, JSON.stringify(countries, null, 2));
         });
     }
     static getMaxHydrofill(country) {
@@ -67,8 +64,8 @@ class Hydrofill {
     }
     static getCountries() {
         return __awaiter(this, void 0, void 0, function* () {
-            const configFile = (0, path_1.join)(__dirname, '../../config', 'countries.json');
-            const countriesString = (0, fs_1.readFileSync)(configFile, 'utf-8');
+            const configFile = join(__dirname, '../../config', 'countries.json');
+            const countriesString = readFileSync(configFile, 'utf-8');
             return JSON.parse(countriesString);
             /*
                 const url = 'https://powercalculator.eu/entsoe/datalists/countries';
@@ -78,5 +75,4 @@ class Hydrofill {
         });
     }
 }
-exports.Hydrofill = Hydrofill;
 Hydrofill.start();

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@powercalc/power-router",
-  "version": "1.0.25",
+  "version": "1.0.28",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "v": "node -v",