2024 09 13 12 43

package.json

@@ -19,7 +19,7 @@
     "prettier": "prettier --check src",
     "prettier-write": "prettier --write src",
     "test": "npm run test-only && npm run eslint && npm run prettier && npm run check-types",
-    "test-only": "jest --coverage",
+    "test-only": "vitest run --coverage",
     "tsc": "npm run clean && npm run tsc-cjs && npm run tsc-esm",
     "tsc-cjs": "tsc --project tsconfig.cjs.json",
     "tsc-esm": "tsc --project tsconfig.esm.json"
@@ -47,19 +47,20 @@
   },
   "homepage": "https://github.com/mljs/conrec#readme",
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.21.2",
-    "@babel/preset-typescript": "^7.21.4",
-    "@types/jest": "^29.5.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+    "@babel/preset-typescript": "^7.24.7",
+    "@types/node": "^22.5.4",
+    "@vitest/coverage-v8": "^2.1.0",
     "eslint": "^8.38.0",
     "eslint-config-cheminfo-typescript": "^11.3.1",
     "esm": "^3.2.25",
-    "jcampconverter": "^9.1.1",
-    "jest": "^29.5.0",
-    "prettier": "^2.8.7",
-    "rimraf": "^5.0.0",
-    "typescript": "^5.0.4"
+    "jcampconverter": "^9.6.4",
+    "prettier": "^3.3.3",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.6.2",
+    "vitest": "^2.1.0"
   },
   "dependencies": {
-    "cheminfo-types": "^1.7.1"
+    "cheminfo-types": "^1.8.0"
   }
 }

src/__tests__/__snapshots__/conrec.test.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`conrec basic test auto select levels 1`] = `
+exports[`conrec basic test > auto select levels 1`] = `
 [
   167.3376920421198,
   182.66230795788022,
@@ -37,7 +37,7 @@ exports[`conrec basic test auto select levels 1`] = `
 ]
 `;
 
-exports[`conrec basic test auto select levels with swapAxes 1`] = `
+exports[`conrec basic test > auto select levels with swapAxes 1`] = `
 [
   182.66230795788022,
   167.3376920421198,

src/__tests__/conrec.test.ts

@@ -2,6 +2,7 @@ import fs from 'fs';
 
 import { NumberMatrix } from 'cheminfo-types';
 import { convert } from 'jcampconverter';
+import { describe, it, expect } from 'vitest';
 
 import { Conrec } from '..';
 
@@ -36,6 +37,19 @@ describe('conrec basic test', () => {
     expect(contours[1].lines).toHaveLength(119720);
   });
 
+  it('no levels', () => {
+    const conrec = new Conrec(matrix);
+    const start = Date.now();
+    const { contours, timeout } = conrec.drawContour({
+      contourDrawer: 'basic',
+      levels: [],
+      timeout: 10000,
+    });
+    expect(Date.now() - start).toBeLessThan(25);
+    expect(timeout).toBeFalsy();
+    expect(contours).toHaveLength(0);
+  });
+
   it('auto select levels', () => {
     const conrec = new Conrec(matrix);
     const { contours, timeout } = conrec.drawContour({
@@ -75,7 +89,7 @@ describe('conrec basic test', () => {
     const { contours, timeout } = conrec.drawContour({
       contourDrawer: 'basic',
       nbLevels: 10,
-      timeout: 100,
+      timeout: 10,
     });
     expect(timeout).toBeTruthy();
     expect(contours).toHaveLength(10);

src/__tests__/shape.test.ts

@@ -1,3 +1,5 @@
+import { describe, it, expect } from 'vitest';
+
 import { Conrec } from '..';
 
 describe('shape', () => {

src/calculateContour.ts

@@ -124,6 +124,7 @@ export function calculateContour(
     jlb = 0,
     jub = matrix[0].length - 1,
   } = options;
+  if (z.length === 0) return false;
   const h = new Array<number>(5);
   const sh = new Array<number>(5);
   const xh = new Array<number>(5);

tsconfig.json

@@ -3,6 +3,7 @@
     "esModuleInterop": true,
     "moduleResolution": "node",
     "outDir": "lib",
+    "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
     "target": "es2020"