Skip to content

Commit 3a8833a

Browse files
targostargos
authored
test: replace Jest with Vitest (#317)
1 parent 928b6e7 commit 3a8833a

File tree

455 files changed

+1833
-1808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

455 files changed

+1833
-1808
lines changed

‎.eslintrc.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/workflows/release-head.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/setup-node@v4
1212
with:
13-
node-version: '20.x'
13+
node-version: '22.x'
1414
registry-url: 'https://registry.npmjs.org'
1515
- name: Install dependencies
1616
run: npm install

‎.github/workflows/typedoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99

1010
env:
11-
NODE_VERSION: 20.x
11+
NODE_VERSION: 22.x
1212
ENTRY_FILE: 'src/index.ts'
1313

1414
jobs:

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ yarn.lock
124124
.DS_Store
125125

126126
lib
127-
lib-esm
127+
lib-cjs
128128

129129
# debug images
130130
src/**/*.tif
@@ -136,3 +136,5 @@ scripts/**/**.png
136136
scripts/**/**.json
137137

138138
private
139+
140+
.jest-image-snapshot-touched-files

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Image processing and manipulation in JavaScript.
1313

1414
## [API](https://image-js.github.io/image-js-typescript/)
1515

16-
Look at the [examples](./examples) directory for how the API is being designed.
17-
1816
## Development
1917

2018
See [Development documentation](./Development.md).

‎api-extractor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*
4646
* SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
4747
*/
48-
"mainEntryPointFilePath": "<projectFolder>/lib-esm/index.d.ts",
48+
"mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
4949

5050
/**
5151
* A list of NPM package names whose exports should be treated as part of this package.

‎demo/.eslintrc.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
root: true
2-
extends: [cheminfo-react, cheminfo-typescript]
3-
rules:
4-
no-console: off

‎demo/components/App.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { HashRouter, Route, Routes } from 'react-router-dom';
22

3-
import { CameraProvider } from '../contexts/cameraContext';
3+
import { CameraProvider } from '../contexts/cameraContext.provider.js';
44

5-
import Filters from './Filters';
6-
import Home from './Home';
5+
import Filters from './Filters.js';
6+
import Home from './Home.js';
77

88
export default function App() {
99
return (

‎demo/components/CameraFeed.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useEffect, useRef } from 'react';
22

3-
import { useCameraContext } from '../contexts/cameraContext';
3+
import { useCameraContext } from '../contexts/cameraContext.js';
44

5-
import UnavailableCamera from './UnavailableCamera';
5+
import UnavailableCamera from './UnavailableCamera.js';
66

77
export default function CameraFeed() {
88
const [{ selectedCamera }] = useCameraContext();
@@ -11,8 +11,12 @@ export default function CameraFeed() {
1111
const video = videoRef.current;
1212
if (!video || !selectedCamera) return;
1313
video.srcObject = selectedCamera.stream;
14-
video.onloadedmetadata = () => {
15-
video.play().catch((err: unknown) => console.error(err));
14+
const onLoadedMetadata = () => {
15+
video.play().catch((error: unknown) => console.error(error));
16+
};
17+
video.addEventListener('loadedmetadata', onLoadedMetadata);
18+
return () => {
19+
video.removeEventListener('loadedmetadata', onLoadedMetadata);
1620
};
1721
}, [selectedCamera]);
1822
if (!selectedCamera) {

‎demo/components/CameraSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useCameraContext } from '../contexts/cameraContext';
1+
import { useCameraContext } from '../contexts/cameraContext.js';
22

33
export default function CameraSelector() {
44
const [{ cameras, selectedCamera }, dispatch] = useCameraContext();
@@ -29,7 +29,7 @@ export default function CameraSelector() {
2929
camera: { device, stream },
3030
});
3131
})
32-
.catch((err: unknown) => console.error(err));
32+
.catch((error: unknown) => console.error(error));
3333
}
3434
}}
3535
>

‎demo/components/CameraSnapshotButton.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { MutableRefObject, RefObject } from 'react';
1+
import type { RefObject } from 'react';
22

3-
import { readCanvas, Image } from '../../src';
3+
import type { Image } from '../../src/index.js';
4+
import { readCanvas } from '../../src/index.js';
45

56
interface CameraSnapshotButtonProps {
6-
snapshotImageRef: MutableRefObject<Image | null>;
7+
snapshotImageRef: RefObject<Image | null>;
78
setSnapshotUrl: (snapshotUrl: string) => void;
8-
canvasInputRef: RefObject<HTMLCanvasElement>;
9+
canvasInputRef: RefObject<HTMLCanvasElement | null>;
910
}
1011

1112
export default function CameraSnapshotButton(props: CameraSnapshotButtonProps) {

‎demo/components/CameraTransform.tsx

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
import { RefObject, useEffect, useRef, useState } from 'react';
1+
import type { RefObject } from 'react';
2+
import { useEffect, useRef, useState } from 'react';
23

3-
import { Image, readCanvas, writeCanvas } from '../../src';
4-
import { convertColor } from '../../src/operations/convertColor';
5-
import { useCameraContext } from '../contexts/cameraContext';
4+
import type { Image } from '../../src/index.js';
5+
import { readCanvas, writeCanvas } from '../../src/index.js';
6+
import { convertColor } from '../../src/operations/convertColor.js';
7+
import { useCameraContext } from '../contexts/cameraContext.js';
68

7-
import ErrorAlert from './ErrorAlert';
8-
import SnapshotImage from './SnapshotImage';
9-
import UnavailableCamera from './UnavailableCamera';
9+
import ErrorAlert from './ErrorAlert.js';
10+
import SnapshotImage from './SnapshotImage.js';
11+
import UnavailableCamera from './UnavailableCamera.js';
1012

1113
export type TransformFunction =
1214
| ((image: Image) => Image)
1315
| ((image: Image, snapshot: Image | null) => Image);
1416

1517
interface CameraTransformProps {
1618
transform: TransformFunction;
17-
canvasInputRef: RefObject<HTMLCanvasElement>;
19+
canvasInputRef: RefObject<HTMLCanvasElement | null>;
1820
snapshotUrl: string;
1921
snapshotImageRef: RefObject<Image | null>;
2022
}
@@ -36,7 +38,7 @@ export default function CameraTransform(props: CameraTransformProps) {
3638
const video = videoRef.current as HTMLVideoElement;
3739
let nextFrameRequest: number;
3840
video.srcObject = selectedCamera.stream;
39-
video.onloadedmetadata = () => {
41+
const onLoadedMetadata = () => {
4042
video
4143
.play()
4244
.then(() => {
@@ -60,18 +62,20 @@ export default function CameraTransform(props: CameraTransformProps) {
6062
result = convertColor(result, 'RGBA');
6163
}
6264
writeCanvas(result, canvasOutput);
63-
} catch (err) {
64-
setError(err.stack);
65-
console.error(err);
65+
} catch (error_) {
66+
setError(error_.stack);
67+
console.error(error_);
6668
}
6769
nextFrameRequest = requestAnimationFrame(nextFrame);
6870
}
6971
nextFrameRequest = requestAnimationFrame(nextFrame);
7072
})
71-
.catch((err: unknown) => console.error(err));
73+
.catch((error_: unknown) => console.error(error_));
7274
};
75+
video.addEventListener('loadedmetadata', onLoadedMetadata);
7376

7477
return () => {
78+
video.removeEventListener('loadedmetadata', onLoadedMetadata);
7579
if (nextFrameRequest) {
7680
cancelAnimationFrame(nextFrameRequest);
7781
}

‎demo/components/Container.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ReactNode } from 'react';
1+
import type { ReactNode } from 'react';
22

3-
import Navbar from './Navbar';
3+
import Navbar from './Navbar.js';
44

55
interface ContainerProps {
66
title: string;

‎demo/components/ErrorAlert.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReactNode } from 'react';
1+
import type { ReactNode } from 'react';
22

33
export default function ErrorAlert(props: { children: ReactNode }) {
44
return (

‎demo/components/Filters.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Container from './Container';
1+
import Container from './Container.js';
22

33
export default function Filters() {
44
return <Container title="Filters">Filters</Container>;

‎demo/components/Home.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import { useRef, useState } from 'react';
22

3-
import { Image } from '../../src';
3+
import type { Image } from '../../src/index.js';
44

5-
import CameraSelector from './CameraSelector';
6-
import CameraSnapshotButton from './CameraSnapshotButton';
7-
import CameraTransform, { TransformFunction } from './CameraTransform';
8-
import Container from './Container';
9-
import { testGetFastKeypoints } from './testFunctions/testGetFastKeypoints';
5+
import CameraSelector from './CameraSelector.js';
6+
import CameraSnapshotButton from './CameraSnapshotButton.js';
7+
import type { TransformFunction } from './CameraTransform.js';
8+
import CameraTransform from './CameraTransform.js';
9+
import Container from './Container.js';
10+
import { testGetFastKeypoints } from './testFunctions/testGetFastKeypoints.js';
1011

1112
const testTransform: TransformFunction = testGetFastKeypoints;
1213

1314
export default function Home() {
1415
const snapshotImageRef = useRef<Image>(null);
1516
const canvasInputRef = useRef<HTMLCanvasElement>(null);
1617
const [snapshotUrl, setSnapshotUrl] = useState('');
17-
console.log(snapshotUrl);
1818
return (
1919
<Container title="Home">
2020
<div className="space-y-1">

‎demo/components/SnapshotImage.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ interface SnapshotImageProps {
44

55
export default function SnapshotImage(props: SnapshotImageProps) {
66
const { snapshotUrl: snapshot } = props;
7-
return <img style={{ transform: 'scaleX(-1)' }} src={snapshot} />;
7+
return snapshot ? (
8+
<img alt="snapshot" style={{ transform: 'scaleX(-1)' }} src={snapshot} />
9+
) : null;
810
}

‎demo/components/UnavailableCamera.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ErrorAlert from './ErrorAlert';
1+
import ErrorAlert from './ErrorAlert.js';
22

33
export default function UnavailableCamera() {
44
return <ErrorAlert>Camera is not available.</ErrorAlert>;

‎demo/components/comparisonFunctions/testComputeSsim.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Image } from '../../../src';
2-
import { computeSsim } from '../../../src/compare/computeSsim';
1+
import { computeSsim } from '../../../src/compare/computeSsim.js';
2+
import { Image } from '../../../src/index.js';
33

44
/**
55
* Compute the structural similarity of the input image and the image blurred.
6-
*
76
* @param image - Input image.
7+
* @param snapshot
88
* @returns The structural similarity matrix.
99
*/
1010
export function testComputeSsim(image: Image, snapshot: Image | null): Image {

‎demo/components/testFunctions/testCannyEdge.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { convertBinaryToGrey, Image } from '../../../src';
1+
import type { Image } from '../../../src/index.js';
2+
import { convertBinaryToGrey } from '../../../src/index.js';
23

34
/**
45
* Detect the edges in the image using Canny edge detection
5-
*
66
* @param image - Input image.
77
* @returns The treated image.
88
*/
@@ -19,7 +19,6 @@ export function testCannyEdge(image: Image): Image {
1919

2020
/**
2121
* Detect the edges in the image using Canny edge detection and overlay the edges on the original image.
22-
*
2322
* @param image - Input image.
2423
* @returns The treated image.
2524
*/

‎demo/components/testFunctions/testColorRois.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Image } from '../../../src';
2-
import { fromMask, colorRois } from '../../../src/roi';
1+
import { Image } from '../../../src/index.js';
2+
import { fromMask, colorRois } from '../../../src/roi/index.js';
33

44
/**
55
* Make a mask out of the image and detect all ROIs. Returns only the white ROIs on a black background.
6-
*
76
* @param image - Input image.
87
* @returns The treated image.
98
*/

‎demo/components/testFunctions/testCopyTo.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Image } from '../../../src';
1+
import { Image } from '../../../src/index.js';
22

33
/**
44
* Copy a black and a red square to the source image.
5-
*
65
* @param image - Input image.
76
* @returns The treated image.
87
*/

‎demo/components/testFunctions/testCorrectColor.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import { Image } from '../../../src';
2-
import { polishAltered } from '../../../src/correctColor/__tests__/testUtils/imageColors';
3-
import { referenceColorCard } from '../../../src/correctColor/__tests__/testUtils/referenceColorCard';
4-
import { correctColor } from '../../../src/correctColor/correctColor';
1+
import { polishAltered } from '../../../src/correctColor/__tests__/testUtils/imageColors.js';
2+
import { referenceColorCard } from '../../../src/correctColor/__tests__/testUtils/referenceColorCard.js';
3+
import { correctColor } from '../../../src/correctColor/correctColor.js';
54
import {
65
getMeasuredColors,
76
getReferenceColors,
8-
} from '../../../src/correctColor/utils/formatData';
7+
} from '../../../src/correctColor/utils/formatData.js';
8+
import type { Image } from '../../../src/index.js';
99

1010
/**
1111
* Copy a black and a red square to the source image.
12-
*
1312
* @param image - Input image.
1413
* @returns The treated image.
1514
*/

‎demo/components/testFunctions/testCrop.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Image } from '../../../src';
1+
import type { Image } from '../../../src/index.js';
22
// options
33
const cropImageRatio = 2; // defines the size of the cropped image
44
const interval = 2; // defines the speed

‎demo/components/testFunctions/testDerivativeFilter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Image } from '../../../src';
1+
import type { Image } from '../../../src/index.js';
22

33
/**
44
* Apply a derivative filter to the source image.
5-
*
65
* @param image - Input image.
76
* @returns The treated image.
87
*/

‎demo/components/testFunctions/testExtract.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { fromMask, Image } from '../../../src';
1+
import { fromMask, Image } from '../../../src/index.js';
22

33
/**
44
* Extract the pixels of a mask from the image.
5-
*
65
* @param image - Input image.
76
* @returns The treated image.
87
*/

‎demo/components/testFunctions/testGetBorderPoints.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { fromMask, Image, Mask } from '../../../src';
1+
import type { Image } from '../../../src/index.js';
2+
import { fromMask, Mask } from '../../../src/index.js';
23
/**
34
* Paint the border of the larger black ROI on the image.
4-
* @param image The image to process
5+
* @param image - The image to process
56
* @returns The processed image.
67
*/
78
export function testGetBorderPoints(image: Image): Image {

‎demo/components/testFunctions/testGetConvexHull.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { fromMask, Image } from '../../../src';
1+
import type { Image } from '../../../src/index.js';
2+
import { fromMask } from '../../../src/index.js';
23

34
/**
45
* Draw the convex Hull polygon of the largest ROI in green and display the filled ROI in purple.
5-
*
66
* @param image - Input image.
77
* @returns The image with the convex Hull.
88
*/

‎demo/components/testFunctions/testGetFastKeypoints.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Image } from '../../../src';
2-
import { getFastKeypoints } from '../../../src/featureMatching/keypoints/getFastKeypoints';
1+
import { getFastKeypoints } from '../../../src/featureMatching/keypoints/getFastKeypoints.js';
2+
import type { Image } from '../../../src/index.js';
33

44
/**
55
* Find the FAST keypoints in the video.
6-
*
76
* @param image - Input image.
87
* @returns The image with the fast keypoints.
98
*/

0 commit comments

Comments
 (0)