task-script-support-cli 0.2.20 → 0.3.0

package/dist/src/templates/task.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTaskTemplate = void 0;
-const getTaskTemplate = (className) => `import { AppTask } from "../wrappers/app-task";
+const camelCase = (s) => s.charAt(0).toLowerCase() + s.slice(1);
+const getTaskTemplate = (className, injections) => {
+    if (!injections || injections.size === 0) {
+        return `import { AppTask } from "../wrappers/app-task";
 import { autoInjectable } from "tsyringe";
 
 /**
@@ -16,5 +19,38 @@ export default class ${className} extends AppTask {
 }
 
 `;
+    }
+    return `import { AppTask } from "../wrappers/app-task";
+import { autoInjectable } from "tsyringe";
+${injections
+        .keys()
+        .toArray()
+        .map((k) => `import { ${k} } from "${injections.get(k)}";`)
+        .join("\n")}
+
+/**
+ * ${className}
+ */
+@autoInjectable()
+export default class ${className} extends AppTask {
+  loggerName = "${className}";
+  
+  constructor(
+    ${injections
+        .keys()
+        .toArray()
+        .map((k) => `private ${camelCase(k)}: ${k}`)
+        .join(",\n    ")}
+  ) {
+    super();
+  }
+  
+  async run() {
+    // TODO: implement task
+  }
+}
+
+`;
+};
 exports.getTaskTemplate = getTaskTemplate;
 //# sourceMappingURL=task.js.map

package/dist/src/templates/task.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"./src/","sources":["src/templates/task.ts"],"names":[],"mappings":";;;AAAO,MAAM,eAAe,GAAG,CAAC,SAAiB,EAAE,EAAE,CACnD;;;;KAIG,SAAS;;;uBAGS,SAAS;kBACd,SAAS;;;;;;CAM1B,CAAC;AAfW,QAAA,eAAe,mBAe1B"}
+{"version":3,"file":"task.js","sourceRoot":"./src/","sources":["src/templates/task.ts"],"names":[],"mappings":";;;AAAA,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEjE,MAAM,eAAe,GAAG,CAC7B,SAAiB,EACjB,UAA+B,EAC/B,EAAE;IACF,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO;;;;KAIN,SAAS;;;uBAGS,SAAS;kBACd,SAAS;;;;;;CAM1B,CAAC;IACA,CAAC;IAED,OAAO;;EAEP,UAAU;SACT,IAAI,EAAE;SACN,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,YAAY,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;SAC1D,IAAI,CAAC,IAAI,CAAC;;;KAGR,SAAS;;;uBAGS,SAAS;kBACd,SAAS;;;MAGrB,UAAU;SACT,IAAI,EAAE;SACN,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;SAC3C,IAAI,CAAC,SAAS,CAAC;;;;;;;;;;CAUrB,CAAC;AACF,CAAC,CAAC;AArDW,QAAA,eAAe,mBAqD1B"}

package/dist/src/types/project.d.ts

@@ -9,4 +9,8 @@ export interface ProjectData {
     serviceFolders: string[];
     commandFolders: string[];
 }
+export type ProjectImport = {
+    importClassName: string;
+    importPath: string;
+};
 //# sourceMappingURL=project.d.ts.map

package/dist/src/types/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"./src/","sources":["src/types/project.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B"}
+{"version":3,"file":"project.d.ts","sourceRoot":"./src/","sources":["src/types/project.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/dist/src/wrappers/gen-app-task.d.ts

@@ -0,0 +1,50 @@
+import { AppTask } from "./app-task";
+import { UtilService } from "../services/util-service";
+import { FileService } from "../services/file-service";
+import { ProjectService } from "../services/project-service";
+import { PromptService } from "../services/prompt-service";
+/**
+ * Generation Task Type
+ */
+export default class GenAppTask extends AppTask {
+    protected utilService: UtilService;
+    protected fileService: FileService;
+    protected projectService: ProjectService;
+    protected promptService: PromptService;
+    constructor(utilService: UtilService, fileService: FileService, projectService: ProjectService, promptService: PromptService);
+    /**
+     * Prompt to select tasks to use in the command being generated.
+     *
+     * @param taskMappings the map to add picked tasks to import for the command
+     */
+    addTasksToMap(taskMappings: Map<string, string>): Promise<void>;
+    /**
+     * Prompt to select services to use in the command being generated.
+     *
+     * @param serviceMappings the map to add picked services to import for the command
+     * @param sourcePath the path to the parent directory of the source file being
+     *  generated to resolve relative paths for imports
+     */
+    addServicesToMap(serviceMappings: Map<string, string>, sourcePath: string): Promise<void>;
+    /**
+     * Formalize the selected imports into a format that can be used in the source code being generated.
+     *
+     * 1. Generate a PascalCased import name from the filename
+     * 2. Convert to a relative path
+     * 3. Remove the file extension for TypeScript import
+     *
+     * @param selectedPaths the selected file paths to formalize
+     * @param relativeSource the path to the source file being generated to resolve relative paths
+     * @returns the formalized ProjectImport array ({ importClassName, importPath })
+     */
+    private formalizeImports;
+    /**
+     * Prompt to select imports to use in the class being generated.
+     *
+     * @param messagePrompt the prompt message to display
+     * @param filePaths the file paths to select from
+     * @returns the selected file paths
+     */
+    private promptForImports;
+}
+//# sourceMappingURL=gen-app-task.d.ts.map

package/dist/src/wrappers/gen-app-task.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gen-app-task.d.ts","sourceRoot":"./src/","sources":["src/wrappers/gen-app-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAE3C,SAAS,CAAC,WAAW,EAAE,WAAW;IAClC,SAAS,CAAC,WAAW,EAAE,WAAW;IAClC,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,aAAa,EAAE,aAAa;gBAH5B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa;IAKxC;;;;OAIG;IACG,aAAa,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAyBrD;;;;;;OAMG;IACG,gBAAgB,CACpB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,UAAU,EAAE,MAAM;IA2BpB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,gBAAgB;IAyBxB;;;;;;OAMG;YACW,gBAAgB;CAiB/B"}

package/dist/src/wrappers/gen-app-task.js

@@ -0,0 +1,124 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const app_task_1 = require("./app-task");
+const tsyringe_1 = require("tsyringe");
+const format_1 = require("../types/format");
+const util_service_1 = require("../services/util-service");
+const file_service_1 = require("../services/file-service");
+const project_service_1 = require("../services/project-service");
+const prompt_service_1 = require("../services/prompt-service");
+/**
+ * Generation Task Type
+ */
+let GenAppTask = class GenAppTask extends app_task_1.AppTask {
+    utilService;
+    fileService;
+    projectService;
+    promptService;
+    constructor(utilService, fileService, projectService, promptService) {
+        super();
+        this.utilService = utilService;
+        this.fileService = fileService;
+        this.projectService = projectService;
+        this.promptService = promptService;
+    }
+    /**
+     * Prompt to select tasks to use in the command being generated.
+     *
+     * @param taskMappings the map to add picked tasks to import for the command
+     */
+    async addTasksToMap(taskMappings) {
+        if (!this.state.data.project?.taskDestination) {
+            return;
+        }
+        const taskFiles = this.fileService.getFilesInDir(this.state.data.project.taskDestination);
+        this.logger.debug(`Found ${taskFiles.length} task files`);
+        const pickedTasks = await this.promptForImports("Include Tasks", taskFiles);
+        this.logger.debug(`Selected ${pickedTasks.length} tasks`);
+        if (!pickedTasks.length) {
+            return;
+        }
+        // add them to the map
+        this.formalizeImports(pickedTasks, this.state.data.project.commandDestination).forEach((i) => taskMappings.set(i.importClassName, i.importPath));
+    }
+    /**
+     * Prompt to select services to use in the command being generated.
+     *
+     * @param serviceMappings the map to add picked services to import for the command
+     * @param sourcePath the path to the parent directory of the source file being
+     *  generated to resolve relative paths for imports
+     */
+    async addServicesToMap(serviceMappings, sourcePath) {
+        if (!this.state.data.project?.serviceDestination) {
+            return;
+        }
+        const serviceFiles = this.fileService.getFilesInDir(this.state.data.project.serviceDestination);
+        this.logger.debug(`Found ${serviceFiles.length} service files`);
+        const pickedServices = await this.promptForImports("Include Services", serviceFiles);
+        this.logger.debug(`Selected ${pickedServices.length} services`);
+        if (!pickedServices.length) {
+            return;
+        }
+        // add them to the map
+        this.formalizeImports(pickedServices, sourcePath).forEach((i) => serviceMappings.set(i.importClassName, i.importPath));
+    }
+    /**
+     * Formalize the selected imports into a format that can be used in the source code being generated.
+     *
+     * 1. Generate a PascalCased import name from the filename
+     * 2. Convert to a relative path
+     * 3. Remove the file extension for TypeScript import
+     *
+     * @param selectedPaths the selected file paths to formalize
+     * @param relativeSource the path to the source file being generated to resolve relative paths
+     * @returns the formalized ProjectImport array ({ importClassName, importPath })
+     */
+    formalizeImports(selectedPaths, relativeSource) {
+        if (!selectedPaths?.length) {
+            return [];
+        }
+        const formalizedPaths = [];
+        for (const fullPath of selectedPaths) {
+            const filename = this.fileService.getFilenameNoExt(fullPath);
+            const importClassName = this.utilService.titleizedToCase(this.utilService.titleizeAll(filename), format_1.CaseType.PASCAL_CASE);
+            formalizedPaths.push({
+                importClassName,
+                importPath: this.fileService
+                    .toRelativePath(relativeSource, fullPath)
+                    .replace(project_service_1.ProjectService.defaults.extention, ""),
+            });
+        }
+        return formalizedPaths;
+    }
+    /**
+     * Prompt to select imports to use in the class being generated.
+     *
+     * @param messagePrompt the prompt message to display
+     * @param filePaths the file paths to select from
+     * @returns the selected file paths
+     */
+    async promptForImports(messagePrompt, filePaths) {
+        return await this.promptService.pickMultiple(messagePrompt, filePaths.map((filePath) => ({
+            name: this.utilService.titleizedToCase(this.utilService.titleizeAll(this.fileService.getFilenameNoExt(filePath)), format_1.CaseType.PASCAL_CASE),
+            value: filePath,
+        })));
+    }
+};
+GenAppTask = __decorate([
+    (0, tsyringe_1.autoInjectable)(),
+    __metadata("design:paramtypes", [util_service_1.UtilService,
+        file_service_1.FileService,
+        project_service_1.ProjectService,
+        prompt_service_1.PromptService])
+], GenAppTask);
+exports.default = GenAppTask;
+//# sourceMappingURL=gen-app-task.js.map

package/dist/src/wrappers/gen-app-task.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gen-app-task.js","sourceRoot":"./src/","sources":["src/wrappers/gen-app-task.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "task-script-support-cli",
-  "version": "0.2.20",
+  "version": "0.3.0",
   "main": "index.js",
   "type": "commonjs",
   "preferGlobal": true,
@@ -17,7 +17,7 @@
     "format": "prettier --write ./",
     "format-check": "prettier --check .",
     "hooks-one-time-setup": "npx simple-git-hooks",
-    "prettier-watch": "onchange \"**/*\" -- prettier --write --ignore-unknown {{changed}}",
+    "format-watch": "onchange \"**/*\" -- prettier --write --ignore-unknown {{changed}}",
     "build": "rm -rf ./dist && npx tsc && node dist/src/index.js -v && npm run cp-assets",
     "prepack": "npm run build",
     "test": "vitest run",

package/src/index.ts

@@ -32,6 +32,7 @@ program
 program
   .command("gen [name]")
   .option("-n, --target-name <name>", "Name of Generated Target")
+  .option("-i, --inject", "Inject services")
   .option("-s, --service", "Generate a service")
   .option("-c, --command", "Generate a command")
   .option("-t, --task", "Generate a task")

package/src/services/file-service.ts

@@ -20,7 +20,8 @@ export class FileService {
   }
 
   toRelativePath(fromPath: string, toPath: string) {
-    return this.ensurePosix(path.relative(fromPath, toPath));
+    const p = this.ensurePosix(path.relative(fromPath, toPath));
+    return !p.includes("/") ? `./${p}` : p;
   }
 
   ensurePosix(possiblyWindowsPath: string) {

package/src/tasks/generate/generate-command.ts

@@ -1,35 +1,23 @@
 import chalk from "chalk";
-import { AppTask } from "../../wrappers/app-task";
 import { autoInjectable } from "tsyringe";
 import { AppState, GenTargetType } from "../../types/state";
-import { FileService } from "../../services/file-service";
-import { UtilService } from "../../services/util-service";
 import { CaseType } from "../../types/format";
 import path from "path";
 import { getCommandTemplate } from "../../templates/command";
 import { ProjectService } from "../../services/project-service";
-import { PromptService } from "../../services/prompt-service";
+import GenerateAppTask from "../../wrappers/gen-app-task";
 
 /**
  * Generates a new command class
  */
 @autoInjectable()
-export default class GenerateCommand extends AppTask {
+export default class GenerateCommand extends GenerateAppTask {
   loggerName = "Generate Command";
 
-  constructor(
-    private fileService: FileService,
-    private utilService: UtilService,
-    private projectService: ProjectService,
-    private promptService: PromptService,
-  ) {
-    super();
-  }
-
   /**
    * Generates a new command class file.
    *
-   * @returns updated state with outputDestination set to generated result path.
+   * @returns updated state with outputDestination set to a generated result path.
    */
   async run(): Promise<void | Partial<AppState>> {
     const { utilService, fileService, projectService } = this;
@@ -52,9 +40,10 @@ export default class GenerateCommand extends AppTask {
     );
     const filename = `${utilService.titleizedToCase(targetName, convention)}${ProjectService.defaults.extention}`;
 
-    const taskMappings = new Map();
-    await this.addTasksToMap(taskMappings);
-    const rendered = getCommandTemplate(className, taskMappings);
+    const injectableMappings = new Map<string, string>();
+    await this.addTasksToMap(injectableMappings);
+
+    const rendered = getCommandTemplate(className, injectableMappings);
     const destination = path.join(targetDirectory, filename);
 
     // write contents
@@ -80,56 +69,4 @@ export default class GenerateCommand extends AppTask {
       throw new Error("Unable to determine targetDirectory");
     }
   }
-
-  /**
-   * Prompt to select tasks to use in the command being generated.
-   *
-   * @param taskMappings the map to add picked tasks to import for the command
-   */
-  async addTasksToMap(taskMappings: Map<string, string>) {
-    if (!this.state.data.project?.taskDestination) {
-      return;
-    }
-
-    const taskFiles = this.fileService.getFilesInDir(
-      this.state.data.project.taskDestination,
-    );
-
-    this.logger.debug(`Found ${taskFiles.length} task files`);
-
-    // prompt for tasks to use in the new command
-    const pickedTasks = await this.promptService.pickMultiple(
-      "Include Tasks",
-      taskFiles.map((tf) => ({
-        name: this.utilService.titleizedToCase(
-          this.utilService.titleizeAll(this.fileService.getFilenameNoExt(tf)),
-          CaseType.PASCAL_CASE,
-        ),
-        value: tf,
-      })),
-    );
-
-    this.logger.debug(`Selected ${pickedTasks.length} tasks`);
-    if (!pickedTasks.length) {
-      return;
-    }
-
-    // add them to the map
-    for (const picked of pickedTasks) {
-      const filename = this.fileService.getFilenameNoExt(picked);
-      const taskClassName = this.utilService.titleizedToCase(
-        this.utilService.titleizeAll(filename),
-        CaseType.PASCAL_CASE,
-      );
-      const relativeSource = this.state.data.project!.commandDestination!;
-      const relativeDest = picked;
-      taskMappings.set(
-        taskClassName,
-        this.fileService
-          .toRelativePath(relativeSource, relativeDest)
-          // remove extension for typescript import
-          .replace(ProjectService.defaults.extention, ""),
-      );
-    }
-  }
 }

package/src/tasks/generate/generate-service.ts

@@ -1,33 +1,23 @@
 import chalk from "chalk";
-import { AppTask } from "../../wrappers/app-task";
 import { autoInjectable } from "tsyringe";
 import { GenTargetType } from "../../types/state";
 import { ProjectService } from "../../services/project-service";
-import { UtilService } from "../../services/util-service";
-import { FileService } from "../../services/file-service";
 import { CaseType } from "../../types/format";
 import path from "path";
 import { getServiceTemplate } from "../../templates/service";
+import GenerateAppTask from "../../wrappers/gen-app-task";
 
 /**
  * Generates a new service class
  */
 @autoInjectable()
-export default class GenerateService extends AppTask {
+export default class GenerateService extends GenerateAppTask {
   loggerName = "Generate Service";
 
-  constructor(
-    private projectService: ProjectService,
-    private utilService: UtilService,
-    private fileService: FileService,
-  ) {
-    super();
-  }
-
   /**
    * Generates a new service class file.
    *
-   * @returns updated state with outputDestination set to generated result path.
+   * @returns updated state with outputDestination set to a generated result path.
    */
   async run() {
     if (this.state.data.genTargetType !== GenTargetType.Service) {
@@ -48,7 +38,11 @@ export default class GenerateService extends AppTask {
       CaseType.PASCAL_CASE,
     );
 
-    const rendered = getServiceTemplate(className);
+    const injectableMappings = new Map<string, string>();
+    if (this.argService.hasFlag("inject")) {
+      await this.addServicesToMap(injectableMappings, targetDirectory);
+    }
+    const rendered = getServiceTemplate(className, injectableMappings);
     const filename = `${utilService.titleizedToCase(targetName, convention)}${ProjectService.defaults.extention}`;
     const destination = path.join(targetDirectory, filename);
 

package/src/tasks/generate/generate-task.ts

@@ -1,33 +1,23 @@
 import chalk from "chalk";
-import { AppTask } from "../../wrappers/app-task";
 import { autoInjectable } from "tsyringe";
 import { GenTargetType } from "../../types/state";
 import { getTaskTemplate } from "../../templates/task";
 import { CaseType } from "../../types/format";
-import { UtilService } from "../../services/util-service";
-import { FileService } from "../../services/file-service";
 import { ProjectService } from "../../services/project-service";
 import path from "path";
+import GenAppTask from "../../wrappers/gen-app-task";
 
 /**
  * Generates a new task class
  */
 @autoInjectable()
-export default class GenerateTask extends AppTask {
+export default class GenerateTask extends GenAppTask {
   loggerName = "Generate Task";
 
-  constructor(
-    private utilService: UtilService,
-    private fileService: FileService,
-    private projectService: ProjectService,
-  ) {
-    super();
-  }
-
   /**
    * Generates a new task class file.
    *
-   * @returns updated state with outputDestination set to generated result path.
+   * @returns updated state with outputDestination set to a generated result path.
    */
   async run() {
     if (this.state.data.genTargetType !== GenTargetType.Task) {
@@ -49,7 +39,11 @@ export default class GenerateTask extends AppTask {
       CaseType.PASCAL_CASE,
     );
 
-    const rendered = getTaskTemplate(className);
+    const injectableMappings = new Map<string, string>();
+    if (this.argService.hasFlag("inject")) {
+      await this.addServicesToMap(injectableMappings, targetDirectory);
+    }
+    const rendered = getTaskTemplate(className, injectableMappings);
     const filename = `${utilService.titleizedToCase(targetName, convention)}${ProjectService.defaults.extention}`;
     const destination = path.join(targetDirectory, filename);
 

package/src/templates/command.ts

@@ -1,3 +1,7 @@
+const nonClashingName = (name: string) => `${name}Task`;
+const nameCheck = (name: string, className: string) =>
+  name === className ? nonClashingName(name) : name;
+
 export const getCommandTemplate = (
   className: string,
   tasks: Map<string, string> = new Map(),
@@ -7,12 +11,16 @@ import { Command } from "../wrappers/command";
 ${tasks
   .keys()
   .toArray()
-  .map((k) => `import ${k} from "${tasks.get(k)}";`)
+  .map((k) => `import ${nameCheck(k, className)} from "${tasks.get(k)}";`)
   .join("\n")}
 
 @singleton()
 export class ${className} extends Command {
-  tasks = [${tasks.keys().toArray().join(", ")}];
+  tasks = [${tasks
+    .keys()
+    .toArray()
+    .map((k) => nameCheck(k, className))
+    .join(", ")}];
 }
 
 `;

package/src/templates/service.ts

@@ -1,5 +1,11 @@
-export const getServiceTemplate = (className: string) =>
-  `import { singleton } from "tsyringe";
+const camelCase = (s: string) => s.charAt(0).toLowerCase() + s.slice(1);
+
+export const getServiceTemplate = (
+  className: string,
+  injections: Map<string, string>,
+) => {
+  if (!injections || injections.size === 0) {
+    return `import { singleton } from "tsyringe";
 
 /**
  * ${className}
@@ -10,3 +16,29 @@ export class ${className} {
 }
 
 `;
+  }
+
+  return `import { singleton } from "tsyringe";
+${injections
+  .keys()
+  .toArray()
+  .map((k) => `import { ${k} } from "${injections.get(k)}";`)
+  .join("\n")}
+
+
+/**
+ * ${className}
+ */
+@singleton()
+export class ${className} {
+  constructor(
+    ${injections
+      .keys()
+      .toArray()
+      .map((k) => `private ${camelCase(k)}: ${k}`)
+      .join(",\n    ")}
+  ) {}
+}
+
+`;
+};

package/src/templates/task.ts

@@ -1,6 +1,34 @@
-export const getTaskTemplate = (className: string) =>
-  `import { AppTask } from "../wrappers/app-task";
+const camelCase = (s: string) => s.charAt(0).toLowerCase() + s.slice(1);
+
+export const getTaskTemplate = (
+  className: string,
+  injections: Map<string, string>,
+) => {
+  if (!injections || injections.size === 0) {
+    return `import { AppTask } from "../wrappers/app-task";
+import { autoInjectable } from "tsyringe";
+
+/**
+ * ${className}
+ */
+@autoInjectable()
+export default class ${className} extends AppTask {
+  loggerName = "${className}";
+  async run() {
+    // TODO: implement task
+  }
+}
+
+`;
+  }
+
+  return `import { AppTask } from "../wrappers/app-task";
 import { autoInjectable } from "tsyringe";
+${injections
+  .keys()
+  .toArray()
+  .map((k) => `import { ${k} } from "${injections.get(k)}";`)
+  .join("\n")}
 
 /**
  * ${className}
@@ -8,9 +36,21 @@ import { autoInjectable } from "tsyringe";
 @autoInjectable()
 export default class ${className} extends AppTask {
   loggerName = "${className}";
+  
+  constructor(
+    ${injections
+      .keys()
+      .toArray()
+      .map((k) => `private ${camelCase(k)}: ${k}`)
+      .join(",\n    ")}
+  ) {
+    super();
+  }
+  
   async run() {
     // TODO: implement task
   }
 }
 
 `;
+};

package/src/types/project.ts

@@ -10,3 +10,8 @@ export interface ProjectData {
   serviceFolders: string[];
   commandFolders: string[];
 }
+
+export type ProjectImport = {
+  importClassName: string;
+  importPath: string;
+};