refactor: move constructor injections (#2133)

containerbase · Feb 5, 2024 · 1c6f0aa · 1c6f0aa
1 parent db3bd5a
commit 1c6f0aa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/src/cli/prepare-tool/prepare-tool-base.service.ts b/src/cli/prepare-tool/prepare-tool-base.service.ts
@@ -1,9 +1,15 @@
-import { injectable } from 'inversify';
+import { inject, injectable } from 'inversify';
+import { EnvService, PathService } from '../services';
 
 @injectable()
 export abstract class PrepareToolBaseService {
   abstract readonly name: string;
 
+  constructor(
+    @inject(PathService) protected readonly pathSvc: PathService,
+    @inject(EnvService) protected readonly envSvc: EnvService,
+  ) {}
+
   abstract execute(): Promise<void> | void;
 
   toString(): string {

diff --git a/src/cli/tools/dart/index.ts b/src/cli/tools/dart/index.ts
@@ -23,10 +23,6 @@ import {
 export class PrepareDartService extends PrepareToolBaseService {
   readonly name = 'dart';
 
-  constructor(@inject(EnvService) private envSvc: EnvService) {
-    super();
-  }
-
   async execute(): Promise<void> {
     await fs.mkdir(`${this.envSvc.home}/.dart`);
     await fs.writeFile(

diff --git a/src/cli/tools/docker/index.ts b/src/cli/tools/docker/index.ts
@@ -15,10 +15,6 @@ import {
 export class PrepareDockerService extends PrepareToolBaseService {
   readonly name = 'docker';
 
-  constructor(@inject(EnvService) private envSvc: EnvService) {
-    super();
-  }
-
   async execute(): Promise<void> {
     await execa('groupadd', ['-g', '999', 'docker']);
     await execa('usermod', ['-aG', 'docker', this.envSvc.userName]);

diff --git a/src/cli/tools/dotnet/index.ts b/src/cli/tools/dotnet/index.ts
@@ -18,11 +18,11 @@ export class PrepareDotnetService extends PrepareToolBaseService {
   readonly name = 'dotnet';
 
   constructor(
-    @inject(EnvService) private readonly envSvc: EnvService,
+    @inject(EnvService) envSvc: EnvService,
     @inject(AptService) private readonly aptSvc: AptService,
-    @inject(PathService) private readonly pathSvc: PathService,
+    @inject(PathService) pathSvc: PathService,
   ) {
-    super();
+    super(pathSvc, envSvc);
   }
 
   async execute(): Promise<void> {

diff --git a/src/cli/tools/flutter.ts b/src/cli/tools/flutter.ts
@@ -17,10 +17,6 @@ import { logger } from '../utils';
 export class PrepareFlutterService extends PrepareToolBaseService {
   readonly name = 'flutter';
 
-  constructor(@inject(EnvService) private readonly envSvc: EnvService) {
-    super();
-  }
-
   override async execute(): Promise<void> {
     const flutter = join(this.envSvc.userHome, '.flutter');
     await fs.writeFile(flutter, '{ "firstRun": false, "enabled": false }');