Merge branch 'main' into cli/api

highcharts · Sep 19, 2024 · c62902f · c62902f
2 parents 7bbef0f + 3c39ead
commit c62902f
Show file tree

Hide file tree

Showing 21 changed files with 65 additions and 45 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -63,5 +63,5 @@ jobs:
       - name: Build webpack bundles
         run: npm run webpack
 
-      - name: Run unit-tests
-        run: npx ts-node test/unit-tests/runtime
+      - name: Run tests
+        run: npm run test:tests
diff --git a/demos/dashboards-rna-news/demo.html b/demos/dashboards-rna-news/demo.html
@@ -5,7 +5,8 @@
         <link rel="stylesheet" href="demo.css" />
         <script src="https://code.highcharts.com/dashboards/datagrid.js"></script>
         <script src="https://code.highcharts.com/highcharts.js"></script>
-        <script src="../../code/connectors-morningstar.src.js"></script>
+        <script src="https://code.highcharts.com/dashboards/dashboards.js"></script>
+        <script src="https://code.highcharts.com/connectors/morningstar/connectors-morningstar.src.js"></script>
         <title>Highcharts Dashboards + Morningstar RNA News</title>
     </head>
     <body>

diff --git a/demos/stock-ohlcv/demo.html b/demos/stock-ohlcv/demo.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="UTF-8" />
         <script src="https://code.highcharts.com/stock/highstock.src.js"></script>
-        <script src="../../code/connectors-morningstar.src.js"></script>
+        <script src="https://code.highcharts.com/connectors/morningstar/connectors-morningstar.src.js"></script>
         <title>Highcharts Stock + Morningstar OHLCV TimeSeries</title>
         <style>
             body {

diff --git a/demos/stock-timeseries/demo.html b/demos/stock-timeseries/demo.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="UTF-8" />
         <script src="https://code.highcharts.com/stock/highstock.src.js"></script>
-        <script src="../../code/connectors-morningstar.src.js"></script>
+        <script src="https://code.highcharts.com/connectors/morningstar/connectors-morningstar.src.js"></script>
         <title>Highcharts Stock + Morningstar TimeSeries</title>
         <style>
             body {

diff --git a/package.json b/package.json
@@ -63,10 +63,10 @@
         "scripts:bin": "rm -rf bin/ && tsc -p src/CLI/ && chmod +x bin/*.js && cp -R src/CLI/Static bin/ && ts-node tools/api",
         "scripts:code": "rm -rf code/ && tsc -p src/",
         "reset": "rm -rf bin/ build/ code/ node_modules/ ; npm i",
-        "test": "npm run webpack && npm run test:eslint && npm run test:unit-tests",
+        "test": "npm run webpack && npm run test:eslint && npm run test:tests",
         "test:eslint": "eslint .",
         "test:morningstar": "npx -y newman run --bail tmp/Collection.json -e tmp/Environment.json",
-        "test:unit-tests": "ts-node test/unit-tests/runtime",
+        "test:tests": "ts-node tools/tests",
         "watch": "tsc -p src/ -w",
         "webpack": "npm run scripts && webpack && npm run webpack:dts",
         "webpack:dts": "npm run webpack:dts:cm",

diff --git a/src/CLI/Library/Server.ts b/src/CLI/Library/Server.ts
@@ -42,25 +42,25 @@ export const DEFAULT_PORT = 8080;
 
 
 export const MIME_TYPES: Record<string, string> = {
-    css: 'text/css; charset=UTF-8',
+    css: 'text/css; charset=utf-8',
     eot: 'application/vnd.ms-fontobject',
     gif: 'image/gif',
-    html: 'text/html; charset=UTF-8',
+    html: 'text/html; charset=utf-8',
     ico: 'image/x-icon',
     jpeg: 'image/jpeg',
     jpg: 'image/jpeg',
-    js: 'application/javascript; charset=UTF-8',
-    json: 'application/json; charset=UTF-8',
-    map: 'application/json; charset=UTF-8',
+    js: 'application/javascript',
+    json: 'application/json',
+    map: 'application/json',
     markdown: 'text/markdown',
-    md: 'text/markdown; charset=UTF-8',
+    md: 'text/markdown; charset=utf-8',
     png: 'image/png',
-    svg: 'image/svg+xml; charset=UTF-8',
+    svg: 'image/svg+xml',
     ttf: 'font/ttf',
-    txt: 'text/plain; charset=UTF-8',
+    txt: 'text/plain; charset=utf-8',
     woff: 'font/woff',
     woff2: 'font/woff2',
-    xml: 'application/xml; charset=UTF-8'
+    xml: 'application/xml'
 };
 
 
@@ -235,7 +235,22 @@ export class Server {
                 ].join('\n'));
                 ext = 'html';
             }
-            response.writeHead(200, { 'Content-Type': MIME_TYPES[ext] });
+
+            if (['html', 'js'].includes(ext)) {
+                fileBuffer = Buffer.from(
+                    fileBuffer
+                        .toString('utf8')
+                        .replace(
+                            /https:\/\/code\.highcharts\.com\/connectors\/morningstar\//u,
+                            '/code/'
+                        )
+                );
+            }
+
+            response.writeHead(200, {
+                'Access-Control-Allow-Origin': '*',
+                'Content-Type': MIMES[ext]
+            });
             response.end(fileBuffer);
 
         } catch (error) {
@@ -271,6 +286,7 @@ export class Server {
     ): Server {
 
         this.folder = (folder || this.folder);
+
         this.http.listen(port);
 
         return this;

diff --git a/src/CLI/connectors-morningstar.ts b/src/CLI/connectors-morningstar.ts
@@ -152,7 +152,9 @@ export async function main (): Promise<void> {
 
     server.start(port);
 
-    console.info(`Content available at http://localhost:${port}.`);
+    if (server.http?.listening) {
+        console.info(`Content available at http://localhost:${port}.`);
+    }
 
     process.stdin.on('data', (data) => {
         const input = data.toString('utf8');

diff --git a/src/Shared/MorningstarPostman.ts b/src/Shared/MorningstarPostman.ts
@@ -75,21 +75,20 @@ export namespace MorningstarPostman {
         const url = postmanEnvironment.getValueOf(/^Morningstar as a Service \(/u);
         const username = postmanEnvironment.getValueOf('Morningstar as a Service Username');
 
+        if (url) {
+            apiOptions.url = url.value;
+            if (apiOptions.url.startsWith('www.')) {
+                apiOptions.url = `https://${apiOptions.url}`;
+            }
+        }
+
         if (password && username) {
             apiOptions.access = {
                 password: password.value,
                 username: username.value
             };
-            if (url) {
-                apiOptions.access.url = `https://${url.value}`;
-            }
-        }
-
-        if (url) {
-            apiOptions.url = url.value;
-
-            if (apiOptions.url.startsWith('www.')) {
-                apiOptions.url = `https://${apiOptions.url}`;
+            if (apiOptions.url && url) {
+                apiOptions.access.url = `${apiOptions.url}/token/oauth`;
             }
         }
 

diff --git a/test/README.md → tests/README.md b/test/README.md → tests/README.md
@@ -20,4 +20,4 @@ You have to define the Morningstar credentials to be able to run the tests.
 
 3. Now you can run the tests with:
 
-   - `npm run test:unit-tests`
+   - `npm run test:tests`
diff --git a/...it-tests/RNANews/RNANewsConverter.test.ts → tests/RNANews/RNANewsConverter.test.ts b/...it-tests/RNANews/RNANewsConverter.test.ts → tests/RNANews/RNANewsConverter.test.ts
@@ -1,6 +1,6 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
-import RNANewsJSON from '../../../src/RNANews/RNANewsJSON';
+import * as MC from '../../code/connectors-morningstar.src';
+import RNANewsJSON from '../../src/RNANews/RNANewsJSON';
 
 export async function rnaNewsLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/.../unit-tests/Shared/MorningstarAPI.test.ts → tests/Shared/MorningstarAPI.test.ts b/.../unit-tests/Shared/MorningstarAPI.test.ts → tests/Shared/MorningstarAPI.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function apiAccess (
     apiOptions: MC.Shared.MorningstarAPIOptions

diff --git a/...tests/TimeSeries/CumulativeReturn.test.ts → tests/TimeSeries/CumulativeReturn.test.ts b/...tests/TimeSeries/CumulativeReturn.test.ts → tests/TimeSeries/CumulativeReturn.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function cumulativeReturnLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/...ests/TimeSeries/DividendConverter.test.ts → tests/TimeSeries/DividendConverter.test.ts b/...ests/TimeSeries/DividendConverter.test.ts → tests/TimeSeries/DividendConverter.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function ratingLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/test/unit-tests/TimeSeries/Growth.test.ts → tests/TimeSeries/Growth.test.ts b/test/unit-tests/TimeSeries/Growth.test.ts → tests/TimeSeries/Growth.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function growthLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/test/unit-tests/TimeSeries/OHLCV.test.ts → tests/TimeSeries/OHLCV.test.ts b/test/unit-tests/TimeSeries/OHLCV.test.ts → tests/TimeSeries/OHLCV.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function ohlcvLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/test/unit-tests/TimeSeries/Price.test.ts → tests/TimeSeries/Price.test.ts b/test/unit-tests/TimeSeries/Price.test.ts → tests/TimeSeries/Price.test.ts
@@ -1,6 +1,6 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
-import MorningstarURL from '../../../src/Shared/MorningstarURL';
+import * as MC from '../../code/connectors-morningstar.src';
+import MorningstarURL from '../../src/Shared/MorningstarURL';
 
 export async function priceLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/test/unit-tests/TimeSeries/Rating.test.ts → tests/TimeSeries/Rating.test.ts b/test/unit-tests/TimeSeries/Rating.test.ts → tests/TimeSeries/Rating.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function ratingLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/test/unit-tests/XRay/Breakdown.test.ts → tests/XRay/Breakdown.test.ts b/test/unit-tests/XRay/Breakdown.test.ts → tests/XRay/Breakdown.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../../code/connectors-morningstar.src';
+import * as MC from '../../code/connectors-morningstar.src';
 
 export async function breakdownLoad (
     api: MC.Shared.MorningstarAPIOptions

diff --git a/test/unit-tests/version.test.ts → tests/version.test.ts b/test/unit-tests/version.test.ts → tests/version.test.ts
@@ -1,5 +1,5 @@
 import * as Assert from 'node:assert/strict';
-import * as MC from '../../code/connectors-morningstar.src';
+import * as MC from '../code/connectors-morningstar.src';
 
 export function version (): void {
 

diff --git a/tools/README.md b/tools/README.md
@@ -1,7 +1,7 @@
 Highcharts Morningstar Connectors Tools
 =======================================
 
-These scripts are used to prepare distribution of new releases.
+These scripts are used to prepare the distribution of new releases.
 
 
 

diff --git a/test/unit-tests/runtime.ts → tools/tests.ts b/test/unit-tests/runtime.ts → tools/tests.ts
@@ -25,11 +25,12 @@
  * */
 
 
-import type { Shared } from '../../code/connectors-morningstar.src';
+import type { Shared } from '../code/connectors-morningstar.src';
 
 import * as FS from 'node:fs/promises';
 import * as FSSync from 'node:fs';
 import * as JSDOM from 'jsdom';
+import * as Path from 'node:path';
 
 
 /* *
@@ -125,19 +126,20 @@ async function runUnitTests () {
     const failures: Array<string> = [];
     const successes: Array<string> = [];
     const stdout = process.stdout;
+    const testFolder = Path.join(__dirname, '..', 'tests');
 
     let test: unknown;
     let unitTests: Record<string, unknown>;
 
-    for (let path of (await FS.readdir(__dirname, { recursive: true })).sort()) {
+    for (let path of (await FS.readdir(testFolder, { recursive: true })).sort()) {
 
         if (!path.endsWith('.test.ts')) {
             continue;
         }
 
         stdWrite('Start', path.substring(0, path.length - 8), 'tests ...\n');
 
-        path = './' + path.substring(0, path.length - 3);
+        path = Path.join(testFolder, path.substring(0, path.length - 3));
         unitTests = await import(path) as Record<string, unknown>;
 
         for (let testName of Object.keys(unitTests)) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ You have to define the Morningstar credentials to be able to run the tests.

		3. Now you can run the tests with:

		- `npm run test:unit-tests`
		- `npm run test:tests`