Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"global-agent": "3.0.0",
"got": "14.4.7",
"ini": "5.0.0",
"inversify": "6.2.2",
"inversify": "7.7.0",
"pino": "9.8.0",
"pino-pretty": "13.1.1",
"pretty-ms": "9.2.0",
Expand Down
63 changes: 45 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/cli/install-tool/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container, injectable } from 'inversify';
import { Container, injectFromBase, injectable } from 'inversify';
import { createContainer } from '../services';
import { ResolverMap } from '../tools';
import { BazeliskInstallService } from '../tools/bazelisk';
Expand Down Expand Up @@ -155,6 +155,7 @@ export function installTool(
switch (type) {
case 'gem': {
@injectable()
@injectFromBase()
class GenericInstallService extends RubyBaseInstallService {
override readonly name: string = tool;

Expand All @@ -176,6 +177,7 @@ export function installTool(
}
case 'npm': {
@injectable()
@injectFromBase()
class GenericInstallService extends NpmBaseInstallService {
override readonly name: string = tool;

Expand All @@ -197,6 +199,7 @@ export function installTool(
}
case 'pip': {
@injectable()
@injectFromBase()
class GenericInstallService extends PipBaseInstallService {
override readonly name: string = tool;

Expand Down Expand Up @@ -236,6 +239,7 @@ export async function resolveVersion(
switch (type) {
case 'gem': {
@injectable()
@injectFromBase()
class GenericVersionResolver extends RubyGemVersionResolver {
override readonly tool: string = tool;
}
Expand All @@ -244,6 +248,7 @@ export async function resolveVersion(
}
case 'npm': {
@injectable()
@injectFromBase()
class GenericVersionResolver extends NpmVersionResolver {
override readonly tool: string = tool;
}
Expand All @@ -252,6 +257,7 @@ export async function resolveVersion(
}
case 'pip': {
@injectable()
@injectFromBase()
class GenericVersionResolver extends PipVersionResolver {
override readonly tool: string = tool;
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ rootContainer.bind(PathService).toSelf();
rootContainer.bind(VersionService).toSelf();

export function createContainer(parent = rootContainer): Container {
return parent.createChild();
return new Container({ parent });
}
3 changes: 2 additions & 1 deletion src/cli/tools/bazelisk.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';

@injectable()
@injectFromBase()
export class BazeliskInstallService extends BaseInstallService {
readonly name = 'bazelisk';

Expand Down
3 changes: 2 additions & 1 deletion src/cli/tools/bun.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';

@injectable()
@injectFromBase()
export class BunInstallService extends BaseInstallService {
readonly name = 'bun';

Expand Down
4 changes: 3 additions & 1 deletion src/cli/tools/dart/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../../install-tool/base-install.service';
import { BasePrepareService } from '../../prepare-tool/base-prepare.service';
import { parse } from '../../utils';
Expand All @@ -20,6 +20,7 @@ import {
// https://storage.googleapis.com/dart-archive/channels/stable/release/2.19.4/sdk/dartsdk-linux-arm64-release.zip.sha256sum

@injectable()
@injectFromBase()
export class DartPrepareService extends BasePrepareService {
readonly name = 'dart';

Expand All @@ -36,6 +37,7 @@ export class DartPrepareService extends BasePrepareService {
}

@injectable()
@injectFromBase()
export class DartInstallService extends BaseInstallService {
readonly name = 'dart';

Expand Down
3 changes: 2 additions & 1 deletion src/cli/tools/devbox.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';

@injectable()
@injectFromBase()
export class DevboxInstallService extends BaseInstallService {
readonly name = 'devbox';

Expand Down
4 changes: 3 additions & 1 deletion src/cli/tools/docker.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';
import { BasePrepareService } from '../prepare-tool/base-prepare.service';

@injectable()
@injectFromBase()
export class DockerPrepareService extends BasePrepareService {
readonly name = 'docker';

Expand All @@ -16,6 +17,7 @@ export class DockerPrepareService extends BasePrepareService {
}

@injectable()
@injectFromBase()
export class DockerInstallService extends BaseInstallService {
readonly name = 'docker';

Expand Down
4 changes: 3 additions & 1 deletion src/cli/tools/dotnet.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { inject, injectable } from 'inversify';
import { inject, injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';
import { BasePrepareService } from '../prepare-tool/base-prepare.service';
import { AptService } from '../services';
import { getDistro, parse, pathExists } from '../utils';

@injectable()
@injectFromBase()
export class DotnetPrepareService extends BasePrepareService {
@inject(AptService)
private readonly aptSvc!: AptService;
Expand Down Expand Up @@ -77,6 +78,7 @@ export class DotnetPrepareService extends BasePrepareService {
}

@injectable()
@injectFromBase()
export class DotnetInstallService extends BaseInstallService {
readonly name = 'dotnet';

Expand Down
4 changes: 3 additions & 1 deletion src/cli/tools/flutter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';
import { BasePrepareService } from '../prepare-tool/base-prepare.service';
import {
Expand All @@ -12,6 +12,7 @@ import {
} from './dart/utils';

@injectable()
@injectFromBase()
export class FlutterPrepareService extends BasePrepareService {
readonly name = 'flutter';

Expand Down Expand Up @@ -56,6 +57,7 @@ export class FlutterPrepareService extends BasePrepareService {
}

@injectable()
@injectFromBase()
export class FlutterInstallService extends BaseInstallService {
readonly name = 'flutter';

Expand Down
3 changes: 2 additions & 1 deletion src/cli/tools/flux.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';

@injectable()
@injectFromBase()
export class FluxInstallService extends BaseInstallService {
readonly name = 'flux';

Expand Down
3 changes: 2 additions & 1 deletion src/cli/tools/gleam.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import fs from 'node:fs/promises';
import { join } from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';
import { semverGte } from '../utils';

@injectable()
@injectFromBase()
export class GleamInstallService extends BaseInstallService {
readonly name = 'gleam';

Expand Down
3 changes: 2 additions & 1 deletion src/cli/tools/helm.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import fs from 'node:fs/promises';
import path from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';

@injectable()
@injectFromBase()
export class HelmInstallService extends BaseInstallService {
readonly name = 'helm';

Expand Down
3 changes: 2 additions & 1 deletion src/cli/tools/helmfile.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import fs from 'node:fs/promises';
import path from 'node:path';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../install-tool/base-install.service';

@injectable()
@injectFromBase()
export class HelmfileInstallService extends BaseInstallService {
readonly name = 'helmfile';

Expand Down
4 changes: 3 additions & 1 deletion src/cli/tools/java/gradle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import fs from 'node:fs/promises';
import { join } from 'node:path';
import { isNonEmptyStringAndNotWhitespace } from '@sindresorhus/is';
import { execa } from 'execa';
import { injectable } from 'inversify';
import { injectFromBase, injectable } from 'inversify';
import { BaseInstallService } from '../../install-tool/base-install.service';
import { ToolVersionResolver } from '../../install-tool/tool-version-resolver';
import { semverCoerce } from '../../utils';
import { GradleVersionData } from './schema';

@injectable()
@injectFromBase()
export class GradleInstallService extends BaseInstallService {
readonly name = 'gradle';

Expand Down Expand Up @@ -55,6 +56,7 @@ export class GradleInstallService extends BaseInstallService {
}

@injectable()
@injectFromBase()
export class GradleVersionResolver extends ToolVersionResolver {
readonly tool = 'gradle';

Expand Down
Loading