Update @types/node, remove the typescript resolution override, target es2018 to cater for new regexp format.

Update numstat and abort integration tests to be more robust

Author: steveukx

package.json

@@ -7,7 +7,6 @@
  "simple-git"
  ],
  "resolutions": {
- "typescript": "4.7.4",
  "jest": "29.7.0"
  },
  "scripts": {

packages/test-typescript-consumer/package.json

@@ -25,6 +25,7 @@
  "directory": "packages/test-typescript-consumer"
  },
  "devDependencies": {
- "jest": "^29.7.0"
+ "jest": "^29.7.0",
+ "typescript": "^5.7.3"
  }
 }

simple-git/package.json

@@ -23,7 +23,7 @@
  "@simple-git/babel-config": "^1.0.0",
  "@types/debug": "^4.1.12",
  "@types/jest": "^29.2.2",
- "@types/node": "^22.13.5",
+ "@types/node": "^22.15.30",
  "esbuild": "^0.25.0",
  "esbuild-node-externals": "^1.18.0",
  "jest": "^29.7.0",

simple-git/src/lib/utils/task-options.ts

@@ -6,7 +6,7 @@ import {
  filterType,
 } from './argument-filters';
 import { asFunction, isUserFunction, last } from './util';
-import { Maybe, Options, OptionsValues } from '../types';
+import { Maybe, Options } from '../types';
 import { isPathSpec } from '../args/pathspec';
 
 export function appendTaskOptions<T extends Options = Options>(
@@ -18,7 +18,7 @@ export function appendTaskOptions<T extends Options = Options>(
  }
 
  return Object.keys(options).reduce((commands: string[], key: string) => {
- const value: OptionsValues = options[key];
+ const value = options[key];
 
  if (isPathSpec(value)) {
  commands.push(value);

simple-git/src/lib/utils/util.ts

@@ -1,16 +1,22 @@
+import { Buffer } from 'node:buffer';
 import { exists, FOLDER } from '@kwsites/file-exists';
 import { Maybe } from '../types';
 
+type Callable = (...args: unknown[]) => unknown;
+
 export const NULL = '\0';
 
-export const NOOP: (...args: any[]) => void = () => {};
+export const NOOP: Callable = () => {};
 
 /**
  * Returns either the source argument when it is a `Function`, or the default
  * `NOOP` function constant
  */
-export function asFunction<T extends () => any>(source: T | any): T {
- return typeof source === 'function' ? source : NOOP;
+export function asFunction<T>(source: T | unknown): Callable {
+ if (typeof source !== 'function') {
+ return NOOP;
+ }
+ return source as Callable;
 }
 
 /**

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

@@ -20,7 +20,7 @@ describe('log-numstat', function () {
  ae: '%ae',
  },
  '--all': null,
- '--since': '2024-02-04',
+ '--since': '2025-01-01',
  '--numstat': null,
  });
 

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

@@ -32,15 +32,15 @@ describe('timeout', () => {
 
  const repos = await Promise.all('abcdef'.split('').map((p) => context.dir(p)));
 
- repos.map((baseDir) => {
+ const tasks = repos.map((baseDir) => {
  const git = newSimpleGit({ baseDir, abort });
  if (baseDir.endsWith('a')) {
  return promiseError(git.init());
  }
  return promiseError(git.clone(upstream, baseDir));
  });
 
- await wait(0);
+ await tasks[0];
  controller.abort();
 
  const results = await Promise.all(

simple-git/tsconfig.json

@@ -2,7 +2,7 @@
  "compilerOptions": {
  "allowJs": false,
  "skipLibCheck": false,
- "target": "es2015",
+ "target": "es2018",
  "module": "commonjs",
  "lib": ["dom", "esnext"],
  "rootDir": ".",

yarn.lock

@@ -2959,6 +2959,7 @@ __metadata:
  "@simple-git/babel-config": "npm:*"
  jest: "npm:^29.7.0"
  simple-git: "npm:*"
+ typescript: "npm:^5.7.3"
  languageName: unknown
  linkType: soft
 
@@ -3174,7 +3175,7 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^22.13.5":
+"@types/node@npm:*":
  version: 22.13.8
  resolution: "@types/node@npm:22.13.8"
  dependencies:
@@ -3190,6 +3191,15 @@ __metadata:
  languageName: node
  linkType: hard
 
+"@types/node@npm:^22.15.30":
+ version: 22.15.30
+ resolution: "@types/node@npm:22.15.30"
+ dependencies:
+ undici-types: "npm:~6.21.0"
+ checksum: 10/16d03f30df7851eea4f31d9a2470a53b24dc7d3909ed1782e2538e3aafe398451da17b83d6f730dfdcd0a843ccdbe841176ecfbde6bdb51963e8d11f58a10ade
+ languageName: node
+ linkType: hard
+
 "@types/normalize-package-data@npm:^2.4.0":
  version: 2.4.4
  resolution: "@types/normalize-package-data@npm:2.4.4"
@@ -8962,7 +8972,7 @@ __metadata:
  "@simple-git/babel-config": "npm:^1.0.0"
  "@types/debug": "npm:^4.1.12"
  "@types/jest": "npm:^29.2.2"
- "@types/node": "npm:^22.13.5"
+ "@types/node": "npm:^22.15.30"
  debug: "npm:^4.4.0"
  esbuild: "npm:^0.25.0"
  esbuild-node-externals: "npm:^1.18.0"
@@ -9595,23 +9605,23 @@ __metadata:
  languageName: node
  linkType: hard
 
-"typescript@npm:4.7.4":
- version: 4.7.4
- resolution: "typescript@npm:4.7.4"
+"typescript@npm:>=3 < 6, typescript@npm:^5.7.3":
+ version: 5.8.3
+ resolution: "typescript@npm:5.8.3"
  bin:
  tsc: bin/tsc
  tsserver: bin/tsserver
- checksum: 10/f056b2313a7df95268ac63dc4ddcb7aed1b7d5a6bbc933d11c3fcd0a77712e16b24bdf4403acc529ade5c27a2a477e25124e899587e8ca3f19685c7ab954c6f3
+ checksum: 10/65c40944c51b513b0172c6710ee62e951b70af6f75d5a5da745cb7fab132c09ae27ffdf7838996e3ed603bb015dadd099006658046941bd0ba30340cc563ae92
  languageName: node
  linkType: hard
 
-"typescript@patch:typescript@npm%3A4.7.4#optional!builtin<compat/typescript>":
- version: 4.7.4
- resolution: "typescript@patch:typescript@npm%3A4.7.4#optional!builtin<compat/typescript>::version=4.7.4&hash=65a307"
+"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.7.3#optional!builtin<compat/typescript>":
+ version: 5.8.3
+ resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
  bin:
  tsc: bin/tsc
  tsserver: bin/tsserver
- checksum: 10/cd6f51368ba0f8c458a44ca8b05684e9cda49acbb4e7dcf40c4720cd1534f68c2d139ec6f179bb9996e6fe9d0c7a04846db55a048f51fd2f3c41fbce0a004971
+ checksum: 10/b9b1e73dabac5dc730c041325dbd9c99467c1b0d239f1b74ec3b90d831384af3e2ba973946232df670519147eb51a2c20f6f96163cea2b359f03de1e2091cc4f
  languageName: node
  linkType: hard
 
@@ -9631,6 +9641,13 @@ __metadata:
  languageName: node
  linkType: hard
 
+"undici-types@npm:~6.21.0":
+ version: 6.21.0
+ resolution: "undici-types@npm:6.21.0"
+ checksum: 10/ec8f41aa4359d50f9b59fa61fe3efce3477cc681908c8f84354d8567bb3701fafdddf36ef6bff307024d3feb42c837cf6f670314ba37fc8145e219560e473d14
+ languageName: node
+ linkType: hard
+
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
  version: 2.0.1
  resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.1"