refactor(cli): share the apt service of the prepare base class

src/cli/prepare-tool/base-prepare.service.ts

@@ -18,7 +18,7 @@ export abstract class BasePrepareService {
   @inject(EnvService)
   protected readonly envSvc!: EnvService;
   @inject(AptService)
-  private readonly _aptSvc!: AptService;
+  protected readonly aptSvc!: AptService;
 
   abstract readonly name: string;
 
@@ -57,7 +57,7 @@ export abstract class BasePrepareService {
     distroPackages: Record<string, string[] | undefined>,
     ...common: string[]
   ): Promise<void> {
-    await this._aptSvc.installDistroPackages(
+    await this.aptSvc.installDistroPackages(
       this.name,
       distroPackages,
       ...common,

src/cli/tools/dotnet/index.ts

@@ -1,16 +1,12 @@
 import { join } from 'node:path';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { BaseInstallService } from '../../install-tool/base-install.service.ts';
 import { BasePrepareService } from '../../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../../services/index.ts';
 import { getDistro, parse, pathExists } from '../../utils/index.ts';
 
 @injectable()
 @injectFromHierarchy()
 export class DotnetPrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   readonly name = 'dotnet';
 
   /**

src/cli/tools/golang.ts

@@ -1,17 +1,13 @@
 import { join } from 'node:path';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { z } from 'zod';
 import { BaseInstallService } from '../install-tool/base-install.service.ts';
 import { BasePrepareService } from '../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../services/index.ts';
 import { parse } from '../utils/index.ts';
 
 @injectable()
 @injectFromHierarchy()
 export class GolangPrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   override readonly name = 'golang';
 
   /**

src/cli/tools/node/index.ts

@@ -1,9 +1,8 @@
 import fs from 'node:fs/promises';
 import { join } from 'node:path';
 import { env as penv } from 'node:process';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { BasePrepareService } from '../../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../../services/index.ts';
 import { fileContent, parse } from '../../utils/index.ts';
 import {
   NodeBaseInstallService,
@@ -14,9 +13,6 @@ import {
 @injectable()
 @injectFromHierarchy()
 export class NodePrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   override name = 'node';
 
   /**

src/cli/tools/php/index.ts

@@ -1,18 +1,14 @@
 import { join } from 'node:path';
 import { isNonEmptyStringAndNotWhitespace } from '@sindresorhus/is';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { BaseInstallService } from '../../install-tool/base-install.service.ts';
 import { ToolVersionResolver } from '../../install-tool/tool-version-resolver.ts';
 import { BasePrepareService } from '../../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../../services/index.ts';
 import { getDistro } from '../../utils/index.ts';
 
 @injectable()
 @injectFromHierarchy()
 export class PhpPrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   override readonly name = 'php';
 
   /**

src/cli/tools/python/conan.ts

@@ -1,17 +1,13 @@
 import { join } from 'node:path';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { BasePrepareService } from '../../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../../services/index.ts';
 import { type Distro, fileContent, getDistro } from '../../utils/index.ts';
 import { PipVersionResolver } from './pip.ts';
 import { PipBaseInstallService } from './utils.ts';
 
 @injectable()
 @injectFromHierarchy()
 export class ConanPrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   override readonly name: string = 'conan';
 
   /**

src/cli/tools/python/index.ts

@@ -1,8 +1,7 @@
 import fs from 'node:fs/promises';
 import { join } from 'node:path';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { BasePrepareService } from '../../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../../services/index.ts';
 import { getDistro, parse } from '../../utils/index.ts';
 import { PrebuildInstallService } from '../utils/prebuild.ts';
 import { pipIndexEnv } from './utils.ts';
@@ -13,9 +12,6 @@ const supportedDistros = ['jammy', 'noble', 'resolute'];
 @injectable()
 @injectFromHierarchy()
 export class PythonPrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   override readonly name = 'python';
 
   /**

src/cli/tools/ruby/index.ts

@@ -1,7 +1,6 @@
 import { join } from 'node:path';
-import { inject, injectFromHierarchy, injectable } from 'inversify';
+import { injectFromHierarchy, injectable } from 'inversify';
 import { BasePrepareService } from '../../prepare-tool/base-prepare.service.ts';
-import { AptService } from '../../services/index.ts';
 import { fileContent, getDistro } from '../../utils/index.ts';
 import { PrebuildInstallService } from '../utils/prebuild.ts';
 
@@ -14,9 +13,6 @@ const linkedDirs = ['.gem', '.cocoapods', 'Library'];
 @injectable()
 @injectFromHierarchy()
 export class RubyPrepareService extends BasePrepareService {
-  @inject(AptService)
-  private readonly aptSvc!: AptService;
-
   override readonly name = 'ruby';
 
   /**