test: migrate simple-git from jest to vitest

biome.json

@@ -76,7 +76,7 @@
       }
     },
     {
-      "includes": ["simple-git/src/git.js", "simple-git/scripts/*"],
+      "includes": ["simple-git/src/git.ts", "simple-git/scripts/*"],
       "linter": {
         "rules": {
           "complexity": {

packages/test-utils/package.json

@@ -2,6 +2,7 @@
   "name": "@simple-git/test-utils",
   "version": "4.0.0",
   "private": true,
+  "main": "index.ts",
   "peerDependencies": {
     "simple-git": "*"
   }

simple-git/package.json

@@ -22,15 +22,13 @@
   },
   "devDependencies": {
     "@kwsites/promise-result": "^1.1.0",
-    "@simple-git/babel-config": "workspace:^",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.2.2",
     "@types/node": "^22.15.30",
+    "@vitest/coverage-v8": "^3.0.0",
     "esbuild": "^0.25.0",
     "esbuild-node-externals": "^1.18.0",
-    "jest": "^29.7.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5"
+    "typescript": "^5",
+    "vitest": "^3.0.0"
   },
   "keywords": [
     "git",
@@ -43,7 +41,7 @@
     "url": "https://github.com/steveukx/git-js.git",
     "directory": "simple-git"
   },
-  "main": "src/index.js",
+  "main": "src/index.ts",
   "module": "dist/esm/index.js",
   "exports": {
     ".": {
@@ -65,8 +63,8 @@
     "build:defs": "tsc -p tsconfig.release.json --outDir dist && cp -r typings dist",
     "build:pkg": "tsx ../devtools/package-json ./simple-git/package.json",
     "prepublishOnly": "pnpm run build:pkg",
-    "test": "jest --coverage",
-    "test:win": "jest .win32.spec.ts$"
+    "test": "vitest run --coverage",
+    "test:win": "vitest run win32"
   },
   "publish": {
     "main": "dist/cjs/index.js",

simple-git/scripts/build.js

@@ -41,7 +41,7 @@ async function cjs() {
    const outfile = resolve(outDir, 'cjs', 'index.js');
 
    await esbuild.build({
-      entryPoints: ['src/index.js'],
+      entryPoints: ['src/index.ts'],
       bundle: true,
       platform: 'node',
       format: 'cjs',

simple-git/src/git.js → simple-git/src/git.ts

@@ -1,9 +1,10 @@
-const { GitExecutor } = require('./lib/runners/git-executor');
-const { SimpleGitApi } = require('./lib/simple-git-api');
+// @ts-nocheck — legacy prototype-style implementation, retyped in the task-refactor PR.
+import { GitExecutor } from './lib/runners/git-executor';
+import { SimpleGitApi } from './lib/simple-git-api';
 
-const { Scheduler } = require('./lib/runners/scheduler');
-const { adhocExecTask, configurationErrorTask } = require('./lib/tasks/task');
-const {
+import { Scheduler } from './lib/runners/scheduler';
+import { adhocExecTask, configurationErrorTask } from './lib/tasks/task';
+import {
    asArray,
    filterArray,
    filterPrimitives,
@@ -13,39 +14,39 @@ const {
    getTrailingOptions,
    trailingFunctionArgument,
    trailingOptionsArgument,
-} = require('./lib/utils');
-const { applyPatchTask } = require('./lib/tasks/apply-patch');
-const {
+} from './lib/utils';
+import { applyPatchTask } from './lib/tasks/apply-patch';
+import {
    branchTask,
    branchLocalTask,
    deleteBranchesTask,
    deleteBranchTask,
-} = require('./lib/tasks/branch');
-const { checkIgnoreTask } = require('./lib/tasks/check-ignore');
-const { checkIsRepoTask } = require('./lib/tasks/check-is-repo');
-const { cleanWithOptionsTask, isCleanOptionsArray } = require('./lib/tasks/clean');
-const { diffSummaryTask } = require('./lib/tasks/diff');
-const { fetchTask } = require('./lib/tasks/fetch');
-const { moveTask } = require('./lib/tasks/move');
-const { pullTask } = require('./lib/tasks/pull');
-const { pushTagsTask } = require('./lib/tasks/push');
-const {
+} from './lib/tasks/branch';
+import { checkIgnoreTask } from './lib/tasks/check-ignore';
+import { checkIsRepoTask } from './lib/tasks/check-is-repo';
+import { cleanWithOptionsTask, isCleanOptionsArray } from './lib/tasks/clean';
+import { diffSummaryTask } from './lib/tasks/diff';
+import { fetchTask } from './lib/tasks/fetch';
+import { moveTask } from './lib/tasks/move';
+import { pullTask } from './lib/tasks/pull';
+import { pushTagsTask } from './lib/tasks/push';
+import {
    addRemoteTask,
    getRemotesTask,
    listRemotesTask,
    remoteTask,
    removeRemoteTask,
-} = require('./lib/tasks/remote');
-const { getResetMode, resetTask } = require('./lib/tasks/reset');
-const { stashListTask } = require('./lib/tasks/stash-list');
-const {
+} from './lib/tasks/remote';
+import { getResetMode, resetTask } from './lib/tasks/reset';
+import { stashListTask } from './lib/tasks/stash-list';
+import {
    addSubModuleTask,
    initSubModuleTask,
    subModuleTask,
    updateSubModuleTask,
-} = require('./lib/tasks/sub-module');
-const { addAnnotatedTagTask, addTagTask, tagListTask } = require('./lib/tasks/tag');
-const { straightThroughBufferTask, straightThroughStringTask } = require('./lib/tasks/task');
+} from './lib/tasks/sub-module';
+import { addAnnotatedTagTask, addTagTask, tagListTask } from './lib/tasks/tag';
+import { straightThroughBufferTask, straightThroughStringTask } from './lib/tasks/task';
 
 function Git(options, plugins) {
    this._plugins = plugins;
@@ -596,4 +597,9 @@ Git.prototype.checkIsRepo = function (checkType, then) {
    );
 };
 
-module.exports = Git;
+const GitConstructor = Git as unknown as new (
+   options: SimpleGitOptions,
+   plugins: PluginStore
+) => SimpleGit;
+
+export default GitConstructor;

simple-git/src/index.ts

@@ -0,0 +1,6 @@
+import { esModuleFactory, gitExportFactory, gitInstanceFactory } from './lib/git-factory';
+import { gitP } from './lib/runners/promise-wrapped';
+
+const simpleGit = esModuleFactory(gitExportFactory(gitInstanceFactory));
+
+export = Object.assign(simpleGit, { gitP, simpleGit });

simple-git/src/lib/git-factory.ts

@@ -18,7 +18,7 @@ import { suffixPathsPlugin } from './plugins/suffix-paths.plugin';
 import { createInstanceConfig, folderExists } from './utils';
 import { SimpleGitOptions } from './types';
 
-const Git = require('../git');
+import Git from '../git';
 
 /**
  * Adds the necessary properties to the supplied object to enable it for use as

simple-git/test/integration/add.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    like,

simple-git/test/integration/bad-initial-path.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    assertGitError,
    createTestContext,
@@ -6,7 +7,7 @@ import {
    SimpleGitTestContext,
 } from '@simple-git/test-utils';
 
-import { GitConstructError } from '../..';
+import { GitConstructError } from 'simple-git';
 
 describe('bad initial path', () => {
    let context: SimpleGitTestContext;

simple-git/test/integration/branches-show-current.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { createTestContext, like, setUpFilesAdded, setUpInit, SimpleGitTestContext } from '@simple-git/test-utils';
 
 describe('branch-show-current', () => {

simple-git/test/integration/branches.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { promiseResult } from '@kwsites/promise-result';
 import {
    assertGitError,

simple-git/test/integration/broken-chains.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { isPromiseFailure, promiseError, promiseResult } from '@kwsites/promise-result';
 import {
    assertGitError,
@@ -89,7 +90,7 @@ describe('broken-chains', () => {
    async function testPromiseChains(git: SimpleGit) {
       const successes: string[] = [];
       const errors: string[] = [];
-      const catcher = jest.fn(() => {
+      const catcher = vi.fn(() => {
          expect(successes).toEqual(['A']);
          expect(errors).toEqual([]);
       });

simple-git/test/integration/change-directory.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { promiseError, promiseResult } from '@kwsites/promise-result';
 import {
    assertGitError,
@@ -67,7 +68,7 @@ describe('change-directory', () => {
    });
 
    it('switches into new directory - chained with callbacks', async () => {
-      const spies = [jest.fn(), jest.fn(), jest.fn()];
+      const spies = [vi.fn(), vi.fn(), vi.fn()];
 
       newSimpleGit(context.root)
          .cwd(goodDir, spies[0])

simple-git/test/integration/check-ignore.win32.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { createTestContext, setUpIgnored, setUpInit, SimpleGitTestContext } from '@simple-git/test-utils';
 import { join } from 'node:path';
 

simple-git/test/integration/check-is-repo.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
    assertGitError,
    createTestContext,
@@ -26,7 +27,7 @@ describe('check-is-repo', () => {
 
    it('throws errors other than in-repo detection errors', async () => {
       const git = newSimpleGit(roots.realRoot).customBinary('nonsense');
-      const catcher = jest.fn((err) => {
+      const catcher = vi.fn((err) => {
          assertGitError(err, 'nonsense');
       });
 

simple-git/test/integration/checkout.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    newSimpleGit,

simple-git/test/integration/clean.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { promiseError } from '@kwsites/promise-result';
 import {
    assertGitError,

simple-git/test/integration/commit.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    newSimpleGit,

simple-git/test/integration/concurrent-commands.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    newSimpleGit,

simple-git/test/integration/config.spec.ts

@@ -1,10 +1,11 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    newSimpleGit,
    setUpInit,
    SimpleGitTestContext,
 } from '@simple-git/test-utils';
-import { GitConfigScope } from '../..';
+import { GitConfigScope } from 'simple-git';
 import { SimpleGit } from '../../typings';
 
 describe('config', () => {

simple-git/test/integration/diff.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    like,

simple-git/test/integration/exec.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { createTestContext, newSimpleGit, SimpleGitTestContext } from '@simple-git/test-utils';
 
 describe('exec', () => {

simple-git/test/integration/fetch.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    newSimpleGit,

simple-git/test/integration/grep.spec.ts

@@ -1,5 +1,6 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { createTestContext, newSimpleGit, SimpleGitTestContext } from '@simple-git/test-utils';
-import { grepQueryBuilder } from '../..';
+import { grepQueryBuilder } from 'simple-git';
 import { pathspec } from '@simple-git/args-pathspec';
 
 describe('grep', () => {

simple-git/test/integration/log-name-status.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import {
    createTestContext,
    like,
@@ -7,7 +8,7 @@ import {
    SimpleGitTestContext,
 } from '@simple-git/test-utils';
 
-import { DiffNameStatus, DiffResultTextFile } from '../..';
+import { DiffNameStatus, DiffResultTextFile } from 'simple-git';
 
 describe('log-name-status', function () {
    let context: SimpleGitTestContext;

simple-git/test/integration/log-numstat.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { promiseError } from '@kwsites/promise-result';
 import { newSimpleGit } from '@simple-git/test-utils';
 

simple-git/test/integration/log.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { promiseResult } from '@kwsites/promise-result';
 import {
    createTestContext,

simple-git/test/integration/merge-integration.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { GitResponseError, MergeResult, SimpleGit } from '../../typings';
 import { promiseError } from '@kwsites/promise-result';
 import {

simple-git/test/integration/output-handler.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { createTestContext, setUpInit, SimpleGitTestContext, wait } from '@simple-git/test-utils';
 
 describe('outputHandler', function () {

simple-git/test/integration/plugin.abort.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { promiseError } from '@kwsites/promise-result';
 import {
    assertGitError,
@@ -8,7 +9,7 @@ import {
    wait,
 } from '@simple-git/test-utils';
 
-import { GitPluginError } from '../..';
+import { GitPluginError } from 'simple-git';
 
 describe('timeout', () => {
    let context: SimpleGitTestContext;

simple-git/test/integration/plugin.completion.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { promiseError } from '@kwsites/promise-result';
 import { createTestContext, newSimpleGit, SimpleGitTestContext } from '@simple-git/test-utils';
 

simple-git/test/integration/plugin.progress.spec.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
 import { createTestContext, newSimpleGit, SimpleGitTestContext } from '@simple-git/test-utils';
 import { SimpleGitOptions } from '../../src/lib/types';
 
@@ -9,7 +10,7 @@ describe('progress-monitor', () => {
    beforeEach(async () => (context = await createTestContext()));
 
    it('emits progress events', async () => {
-      const progress = jest.fn();
+      const progress = vi.fn();
       const opt: Partial<SimpleGitOptions> = {
          baseDir: context.root,
          progress,
@@ -36,6 +37,6 @@ describe('progress-monitor', () => {
    });
 });
 
-function progressEventsAtStage(mock: jest.Mock, stage: string) {
+function progressEventsAtStage(mock: Mock, stage: string) {
    return mock.mock.calls.filter((c) => c[0].stage === stage).map((c) => c[0]);
 }