Update configs.

Update configurations and try to get tests working in CI.
jamesbuch · Sep 14, 2024 · a5cd338 · a5cd338
1 parent c3bd492
commit a5cd338
Show file tree

Hide file tree

Showing 7 changed files with 1,725 additions and 109 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,15 @@
+export default {
+    preset: 'ts-jest/presets/default-esm',
+    extensionsToTreatAsEsm: ['.ts'],
+    moduleNameMapper: {
+        '^(\\.{1,2}/.*)\\.js$': '$1',
+    },
+    transform: {
+        '^.+\\.tsx?$': [
+            'ts-jest',
+            {
+                useESM: true,
+            },
+        ],
+    },
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "coinspot-v2-api",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "description": "CoinSpot v2 API https://www.coinspot.com.au/v2/api",
     "homepage": "https://npmjs.com/coinspot-api-v2",
     "keywords": [
@@ -29,17 +29,20 @@
         "url": "https://github.com/jamesbuch"
     },
     "scripts": {
-        "build": "tsc",
-        "test": "jest",
         "dev": "node --loader ts-node/esm --experimental-specifier-resolution=node examples/demo.ts",
-        "test:coverage": "jest --coverage",
-        "lint": "eslint ."
+        "lint": "eslint .",
+        "build": "tsc -p tsconfig.build.json",
+        "test": "node --experimental-vm-modules node_modules/.bin/jest",
+        "test:coverage": "node --experimental-vm-modules node_modules/.bin/jest --coverage"
     },
     "dependencies": {
         "axios": "^1.7.7",
         "winston": "^3.14.2"
     },
     "devDependencies": {
+        "@babel/core": "^7.25.2",
+        "@babel/preset-env": "^7.25.4",
+        "@babel/preset-typescript": "^7.24.7",
         "@types/jest": "^29.5.13",
         "@types/node": "^22.5.4",
         "@types/winston": "^2.4.4",
@@ -62,13 +65,14 @@
             "html"
         ],
         "collectCoverageFrom": [
-            "src/**/*.ts",
-            "!src/types.ts",
-            "!src/examples/**"
-        ]
+            "src/**/*.{js,ts}",
+            "!**/node_modules/**",
+            "!**/vendor/**"
+        ],
+        "coverageDirectory": "coverage"
     },
     "jest-junit": {
         "outputDirectory": ".",
         "outputName": "junit.xml"
     }
-}
+}
diff --git a/tests/authenticatedApi.test.ts b/tests/authenticatedApi.test.ts
@@ -1,19 +1,28 @@
 import { AuthenticatedCoinspotApi } from '../src/authenticatedApi';
 
-try {
-    const dotenv = await import('dotenv');
-    dotenv.config();
-} catch (e) {
-    // console.log('dotenv not found, skipping .env file loading');
-}
+let API_KEY: string;
+let API_SECRET: string;
 
-const API_KEY = process.env.COINSPOT_API_KEY as string;
-const API_SECRET = process.env.COINSPOT_API_SECRET as string;
+beforeAll(async () => {
+    try {
+        const dotenv = await import('dotenv');
+        dotenv.config();
+    } catch (e) {
+        console.log('dotenv not found, skipping .env file loading');
+    }
+
+    API_KEY = process.env.COINSPOT_API_KEY!;
+    API_SECRET = process.env.COINSPOT_API_SECRET!;
+
+    if (!API_KEY || !API_SECRET) {
+        throw new Error('COINSPOT_API_KEY and COINSPOT_API_SECRET must be set in environment variables or .env file');
+    }
+});
 
-const api = new AuthenticatedCoinspotApi(API_KEY, API_SECRET);
 
 describe('Authenticated API', () => {
     const testCoin = 'btc';
+    const api = new AuthenticatedCoinspotApi(API_KEY, API_SECRET);
 
     test('getCoinWithdrawalDetails', async () => {
         const result = await api.getCoinWithdrawalDetails(testCoin);

diff --git a/tests/authenticatedReadOnlyApi.test.ts b/tests/authenticatedReadOnlyApi.test.ts
@@ -1,19 +1,26 @@
 import { AuthenticatedCoinspotReadOnlyApi } from '../src/authenticatedReadOnlyApi';
-
-try {
-    const dotenv = await import('dotenv');
-    dotenv.config();
-} catch (e) {
-    // console.log('dotenv not found, skipping .env file loading');
-}
-
-const API_KEY = process.env.COINSPOT_API_KEY as string;
-const API_SECRET = process.env.COINSPOT_API_SECRET as string;
-
-const api = new AuthenticatedCoinspotReadOnlyApi(API_KEY, API_SECRET);
+let API_KEY: string;
+let API_SECRET: string;
+
+beforeAll(async () => {
+    try {
+        const dotenv = await import('dotenv');
+        dotenv.config();
+    } catch (e) {
+        console.log('dotenv not found, skipping .env file loading');
+    }
+
+    API_KEY = process.env.COINSPOT_API_KEY!;
+    API_SECRET = process.env.COINSPOT_API_SECRET!;
+
+    if (!API_KEY || !API_SECRET) {
+        throw new Error('COINSPOT_API_KEY and COINSPOT_API_SECRET must be set in environment variables or .env file');
+    }
+});
 
 describe('Authenticated Read-Only API', () => {
     const testCoin = 'btc';
+    const api = new AuthenticatedCoinspotReadOnlyApi(API_KEY, API_SECRET);
 
     test('getReadOnlyStatus', async () => {
         const result = await api.getReadOnlyStatus();

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig.json",
+    "exclude": [
+        "node_modules",
+        "dist",
+        "tests"
+    ]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,26 +2,23 @@
     "compilerOptions": {
         "target": "ES2022",
         "module": "ES2022",
-        "lib": [
-            "ES2022"
-        ],
         "moduleResolution": "node",
-        "declaration": true,
-        "declarationMap": true,
-        "sourceMap": true,
-        "outDir": "./dist",
-        "rootDir": "./src",
-        "strict": true,
         "esModuleInterop": true,
-        "skipLibCheck": true,
-        "forceConsistentCasingInFileNames": true
+        "strict": true,
+        "outDir": "./dist",
+        "rootDir": ".",
+        "types": [
+            "jest",
+            "node"
+        ]
     },
     "include": [
-        "src/**/*"
+        "src/**/*",
+        "tests/**/*"
     ],
     "exclude": [
         "node_modules",
-        "**/*.test.ts"
+        "dist"
     ],
     "ts-node": {
         "esm": true,