Skip to content

fix: resolve mocha binary from package.json #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Danielku15 merged 1 commit into from
Sep 13, 2024
Merged

fix: resolve mocha binary from package.json #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/configurationFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class ConfigurationFile implements vscode.Disposable {
}

async getMochaSpawnArgs(customArgs: readonly string[]): Promise<string[]> {
this._pathToMocha ??= await this._resolveLocalMochaPath('/bin/mocha.js');
this._pathToMocha ??= await this._resolveLocalMochaBinPath();

return [
await getPathToNode(this.logChannel),
Expand Down Expand Up @@ -133,11 +133,29 @@ export class ConfigurationFile implements vscode.Disposable {
throw new HumanError(`Could not find node_modules above '${mocha}'`);
}

private _resolveLocalMochaPath(suffix?: string): Promise<string> {
private async _resolveLocalMochaBinPath(): Promise<string> {
try {
const packageJsonPath = await this._resolveLocalMochaPath('/package.json');
const packageJson = JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf-8'));
let binPath = packageJson?.bin?.mocha;
if (binPath) {
binPath = path.join(path.dirname(packageJsonPath), binPath);
await fs.promises.access(binPath);
return binPath;
}
} catch (e) {
// ignore
}

this.logChannel.warn('Could not resolve mocha bin path from package.json, fallback to default');
return await this._resolveLocalMochaPath('/bin/mocha.js');
}

private _resolveLocalMochaPath(suffix: string = ''): Promise<string> {
return new Promise<string>((resolve, reject) => {
const dir = path.dirname(this.uri.fsPath);
this.logChannel.debug(`resolving 'mocha${suffix}' via ${dir}`);
this.getResolver().resolve({}, dir, 'mocha' + (suffix ?? ''), {}, (err, res) => {
this.getResolver().resolve({}, dir, 'mocha' + suffix, {}, (err, res) => {
if (err) {
this.logChannel.error(`resolving 'mocha${suffix}' failed with error ${err}`);
reject(
Expand Down