task-script-support-cli 0.3.0 → 0.3.2

package/dist/assets/yargs-template/task-runner/tests/commands/verify.test.ts

@@ -1,41 +1,34 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, it, expect, vi } from "vitest";
-import PrintBanner from "../../src/tasks/print-banner";
+import PrintBanner from "../../src/tasks/banner/print-banner";
 import CheckEnv from "../../src/tasks/check-env";
 import { container } from "tsyringe";
-import { CommandService } from "task-script-support";
-import { AppStateData, CLIArgs } from "../../src/types/state";
+import ResolveBannerFont from "../../src/tasks/banner/resolve-banner-font";
+import { VerifyCommand } from "../../src/commands/verify";
+import { CLIArgs } from "../../src/types/state";
 
-// Mock the tasks and their run methods
-vi.mock("../../src/tasks/print-banner", () => {
-  const PrintBannerMock = vi.fn();
-  PrintBannerMock.prototype.run = vi.fn();
-  return { default: PrintBannerMock };
-});
-
-vi.mock("../../src/tasks/check-env", () => {
-  const CheckEnvMock = vi.fn();
-  CheckEnvMock.prototype.run = vi.fn();
-  return { default: CheckEnvMock };
-});
+vi.mock("../../src/tasks/banner/resolve-banner-font");
+vi.mock("../../src/tasks/banner/print-banner");
+vi.mock("../../src/tasks/check-env");
+vi.mock("../../src/tasks/log-state");
 
 describe("verify command", () => {
   it("should run PrintBanner and then CheckEnv", async () => {
-    const tasks = [PrintBanner, CheckEnv];
-    container.register("Args", { useValue: [] });
+    const args: CLIArgs[] = [];
 
+    container.register("Args", { useValue: args });
     // when
-    await new CommandService<AppStateData, CLIArgs>().runTasks(
-      tasks,
-      {} as CLIArgs,
-    );
+    await container.resolve(VerifyCommand).handler(args);
 
     expect(PrintBanner).toHaveBeenCalled();
     expect(CheckEnv).toHaveBeenCalled();
 
     const printBannerInstance = (PrintBanner as any).mock.instances[0];
     const checkEnvInstance = (CheckEnv as any).mock.instances[0];
+    const resolveBannerFontInstance = (ResolveBannerFont as any).mock
+      .instances[0];
 
+    expect(resolveBannerFontInstance.run).toHaveBeenCalled();
     expect(printBannerInstance.run).toHaveBeenCalled();
     expect(checkEnvInstance.run).toHaveBeenCalled();
   });

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "task-script-support-cli",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "main": "index.js",
     "type": "commonjs",
     "preferGlobal": true,

package/dist/src/commands/gen.d.ts

@@ -4,11 +4,13 @@ import PrintBanner from "../tasks/stdout/print-banner";
 import SelectGenTarget from "../tasks/generate/select-gen-target";
 import GenerateService from "../tasks/generate/generate-service";
 import GenerateCommand from "../tasks/generate/generate-command";
+import GenerateTask from "../tasks/generate/generate-task";
 import PrintGeneratedResults from "../tasks/stdout/print-generated-results";
 import SyncConfiguration from "../tasks/sync-configuration";
 import SelectGenTargetName from "../tasks/generate/select-gen-target-name";
 import ProjectContextGuard from "../tasks/generate/project-context-guard";
+import ResolveInjectables from "../tasks/generate/resolve-injectables";
 export declare class GenCommand extends Command {
-    tasks: (typeof PrintBanner | typeof CheckEnvironment | typeof SelectGenTarget | typeof PrintGeneratedResults | typeof SyncConfiguration | typeof SelectGenTargetName | typeof ProjectContextGuard | (typeof GenerateService | typeof GenerateCommand)[])[];
+    tasks: (typeof PrintBanner | typeof CheckEnvironment | typeof SelectGenTarget | typeof PrintGeneratedResults | typeof SyncConfiguration | typeof SelectGenTargetName | typeof ProjectContextGuard | typeof ResolveInjectables | (typeof GenerateService | typeof GenerateCommand | typeof GenerateTask)[])[];
 }
 //# sourceMappingURL=gen.d.ts.map

package/dist/src/commands/gen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gen.d.ts","sourceRoot":"./src/","sources":["src/commands/gen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,qCAAqC,CAAC;AAClE,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,eAAe,MAAM,oCAAoC,CAAC;AAEjE,OAAO,qBAAqB,MAAM,yCAAyC,CAAC;AAC5E,OAAO,iBAAiB,MAAM,6BAA6B,CAAC;AAC5D,OAAO,mBAAmB,MAAM,0CAA0C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,yCAAyC,CAAC;AAE1E,qBACa,UAAW,SAAQ,OAAO;IACrC,KAAK,sPASH;CACH"}
+{"version":3,"file":"gen.d.ts","sourceRoot":"./src/","sources":["src/commands/gen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,qCAAqC,CAAC;AAClE,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,qBAAqB,MAAM,yCAAyC,CAAC;AAC5E,OAAO,iBAAiB,MAAM,6BAA6B,CAAC;AAC5D,OAAO,mBAAmB,MAAM,0CAA0C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,yCAAyC,CAAC;AAC1E,OAAO,kBAAkB,MAAM,uCAAuC,CAAC;AAEvE,qBACa,UAAW,SAAQ,OAAO;IACrC,KAAK,wSAUH;CACH"}

package/dist/src/commands/gen.js

@@ -22,6 +22,7 @@ const print_generated_results_1 = __importDefault(require("../tasks/stdout/print
 const sync_configuration_1 = __importDefault(require("../tasks/sync-configuration"));
 const select_gen_target_name_1 = __importDefault(require("../tasks/generate/select-gen-target-name"));
 const project_context_guard_1 = __importDefault(require("../tasks/generate/project-context-guard"));
+const resolve_injectables_1 = __importDefault(require("../tasks/generate/resolve-injectables"));
 let GenCommand = class GenCommand extends command_1.Command {
     tasks = [
         print_banner_1.default,
@@ -30,6 +31,7 @@ let GenCommand = class GenCommand extends command_1.Command {
         select_gen_target_1.default,
         sync_configuration_1.default,
         select_gen_target_name_1.default,
+        resolve_injectables_1.default,
         [generate_command_1.default, generate_service_1.default, generate_task_1.default],
         print_generated_results_1.default,
     ];

package/dist/src/commands/gen.js.map

@@ -1 +1 @@
-{"version":3,"file":"gen.js","sourceRoot":"./src/","sources":["src/commands/gen.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAqC;AACrC,iDAA8C;AAC9C,mEAAkD;AAClD,gFAAuD;AACvD,4FAAkE;AAClE,0FAAiE;AACjE,0FAAiE;AACjE,oFAA2D;AAC3D,sGAA4E;AAC5E,qFAA4D;AAC5D,sGAA2E;AAC3E,oGAA0E;AAGnE,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,iBAAO;IACrC,KAAK,GAAG;QACN,sBAAW;QACX,mBAAgB;QAChB,+BAAmB;QACnB,2BAAe;QACf,4BAAiB;QACjB,gCAAmB;QACnB,CAAC,0BAAe,EAAE,0BAAe,EAAE,uBAAY,CAAC;QAChD,iCAAqB;KACtB,CAAC;CACH,CAAA;AAXY,gCAAU;qBAAV,UAAU;IADtB,IAAA,oBAAS,GAAE;GACC,UAAU,CAWtB"}
+{"version":3,"file":"gen.js","sourceRoot":"./src/","sources":["src/commands/gen.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAqC;AACrC,iDAA8C;AAC9C,mEAAkD;AAClD,gFAAuD;AACvD,4FAAkE;AAClE,0FAAiE;AACjE,0FAAiE;AACjE,oFAA2D;AAC3D,sGAA4E;AAC5E,qFAA4D;AAC5D,sGAA2E;AAC3E,oGAA0E;AAC1E,gGAAuE;AAGhE,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,iBAAO;IACrC,KAAK,GAAG;QACN,sBAAW;QACX,mBAAgB;QAChB,+BAAmB;QACnB,2BAAe;QACf,4BAAiB;QACjB,gCAAmB;QACnB,6BAAkB;QAClB,CAAC,0BAAe,EAAE,0BAAe,EAAE,uBAAY,CAAC;QAChD,iCAAqB;KACtB,CAAC;CACH,CAAA;AAZY,gCAAU;qBAAV,UAAU;IADtB,IAAA,oBAAS,GAAE;GACC,UAAU,CAYtB"}

package/dist/src/services/project-service.d.ts

@@ -1,6 +1,8 @@
 import { FileService } from "./file-service";
 import { CaseType } from "../types/format";
 import { UtilService } from "./util-service";
+import { GenData } from "../types/state";
+import { ProjectImport } from "../types/project";
 export declare class ProjectService {
     private fileService;
     private utilService;
@@ -11,6 +13,18 @@ export declare class ProjectService {
         extention: string;
     };
     constructor(fileService: FileService, utilService: UtilService);
+    /**
+     * 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: string[], relativeSource: string): ProjectImport[];
     /**
      * Get all task files found in the project
      *
@@ -18,6 +32,13 @@ export declare class ProjectService {
      */
     getTaskFiles(): string[];
     private getSourceFiles;
+    /**
+     * Returns a map of import class names to import paths.
+     *
+     * @param genData the GenData object containing the ProjectImport objects to map
+     * @returns a Map of import class names to relative import paths
+     */
+    getImportMap(genData: GenData): Map<string, string>;
     /**
      * Looks for a naming convention on the given filename array. Returns
      * the first found convention or the default one if it can't be detected.

package/dist/src/services/project-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-service.d.ts","sourceRoot":"./src/","sources":["src/services/project-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBACa,cAAc;IASvB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IATrB,MAAM,CAAC,QAAQ;;;;;MAKb;gBAGQ,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW;IAGlC;;;;OAIG;IACH,YAAY;IAQZ,OAAO,CAAC,cAAc;IAgBtB;;;;;;OAMG;IACH,aAAa,IAAI,QAAQ;CAiB1B;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,cAAc,CAAC,QAAQ,CAAC"}
+{"version":3,"file":"project-service.d.ts","sourceRoot":"./src/","sources":["src/services/project-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBACa,cAAc;IASvB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IATrB,MAAM,CAAC,QAAQ;;;;;MAKb;gBAGQ,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW;IAGlC;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,aAAa,EAAE,MAAM,EAAE,EACvB,cAAc,EAAE,MAAM,GACrB,aAAa,EAAE;IAsBlB;;;;OAIG;IACH,YAAY;IAQZ,OAAO,CAAC,cAAc;IAgBtB;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,OAAO;IAU7B;;;;;;OAMG;IACH,aAAa,IAAI,QAAQ;CAiB1B;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,cAAc,CAAC,QAAQ,CAAC"}

package/dist/src/services/project-service.js

@@ -29,6 +29,34 @@ let ProjectService = class ProjectService {
         this.fileService = fileService;
         this.utilService = utilService;
     }
+    /**
+     * 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(ProjectService_1.defaults.extention, ""),
+            });
+        }
+        return formalizedPaths;
+    }
     /**
      * Get all task files found in the project
      *
@@ -54,6 +82,19 @@ let ProjectService = class ProjectService {
                 .flatMap((dirPath) => this.fileService.getFilesInDir(dirPath)),
         ];
     }
+    /**
+     * Returns a map of import class names to import paths.
+     *
+     * @param genData the GenData object containing the ProjectImport objects to map
+     * @returns a Map of import class names to relative import paths
+     */
+    getImportMap(genData) {
+        const imports = genData.imports || [];
+        return new Map(imports.map((imp) => [
+            imp.importClassName,
+            imp.importPath,
+        ]));
+    }
     /**
      * Looks for a naming convention on the given filename array. Returns
      * the first found convention or the default one if it can't be detected.

package/dist/src/services/project-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-service.js","sourceRoot":"./src/","sources":["src/services/project-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,iDAA6C;AAC7C,4CAA2C;AAC3C,iDAA6C;AAGtC,IAAM,cAAc,GAApB,MAAM,cAAc;;IASf;IACA;IATV,MAAM,CAAC,QAAQ,GAAG;QAChB,UAAU,EAAE,aAAa;QACzB,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE,iBAAQ,CAAC,WAAW;QAChC,SAAS,EAAE,KAAK;KACjB,CAAC;IAEF,YACU,WAAwB,EACxB,WAAwB;QADxB,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;IAC/B,CAAC;IAEJ;;;;OAIG;IACH,YAAY;QACV,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACvD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAE7D,kCAAkC;QAClC,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAEO,cAAc;QACpB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAEvD,OAAO;YACL,GAAG,IAAI,CAAC,WAAW;iBAChB,WAAW,CAAC,UAAU,CAAC;iBACvB,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAChE,GAAG,IAAI,CAAC,WAAW;iBAChB,cAAc,CAAC,UAAU,CAAC;iBAC1B,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAChE,GAAG,IAAI,CAAC,WAAW;iBAChB,cAAc,CAAC,UAAU,CAAC;iBAC1B,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,aAAa;QACX,MAAM,aAAa,GAAa,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtD,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC5C,OAAO,gBAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC5C,CAAC;QAED,IAAI,UAAU,GAAoB,IAAI,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACpD,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACxB,MAAM;YACR,CAAC;QACH,CAAC;QACD,OAAO,UAAU,IAAI,gBAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC1D,CAAC;;AAjEU,wCAAc;yBAAd,cAAc;IAD1B,IAAA,yBAAc,GAAE;qCAUQ,0BAAW;QACX,0BAAW;GAVvB,cAAc,CAkE1B"}
+{"version":3,"file":"project-service.js","sourceRoot":"./src/","sources":["src/services/project-service.ts"],"names":[],"mappings":"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"}

package/dist/src/services/templater-service.d.ts

@@ -13,6 +13,7 @@ export declare class TemplateService {
     constructor(spawnService: SpawnService, logger: LogService);
     runTemplater(outputName: string): Promise<void>;
     private ensureDestinationExists;
+    toLogPath(pathString: string): string;
     private copyDirectories;
     private copyFiles;
     private fixNaming;

package/dist/src/services/templater-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templater-service.d.ts","sourceRoot":"./src/","sources":["src/services/templater-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,qBACa,eAAe;IAgCxB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IAhChB,OAAO,CAAC,UAAU,CAA0B;IAE5C,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,WAAW,CAAU;IAE7B,OAAO,CAAC,aAAa,CAAyC;IAC9D,OAAO,CAAC,cAAc,CAapB;IACF,OAAO,CAAC,WAAW,CAOjB;gBAGQ,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,UAAU;IASf,YAAY,CAAC,UAAU,EAAE,MAAM;YAoB9B,uBAAuB;YAMvB,eAAe;YASf,SAAS;YAST,SAAS;YAWT,eAAe;YAOf,kBAAkB;YAOlB,gCAAgC;YAUhC,gBAAgB;YAWhB,iBAAiB;CAQhC"}
+{"version":3,"file":"templater-service.d.ts","sourceRoot":"./src/","sources":["src/services/templater-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,qBACa,eAAe;IAgCxB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IAhChB,OAAO,CAAC,UAAU,CAA0B;IAE5C,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,WAAW,CAAU;IAE7B,OAAO,CAAC,aAAa,CAAyC;IAC9D,OAAO,CAAC,cAAc,CAapB;IACF,OAAO,CAAC,WAAW,CAOjB;gBAGQ,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,UAAU;IASf,YAAY,CAAC,UAAU,EAAE,MAAM;YAoB9B,uBAAuB;IAMrC,SAAS,CAAC,UAAU,EAAE,MAAM;YAOd,eAAe;YAUf,SAAS;YAUT,SAAS;YAWT,eAAe;YAOf,kBAAkB;YAOlB,gCAAgC;YAUhC,gBAAgB;YAahB,iBAAiB;CAQhC"}

package/dist/src/services/templater-service.js

@@ -19,6 +19,7 @@ const tsyringe_1 = require("tsyringe");
 const spawn_service_1 = require("./spawn-service");
 const log_service_1 = require("./log-service");
 const docker_ignore_1 = require("../templates/docker-ignore");
+const chalk_1 = __importDefault(require("chalk"));
 const gitignoreContent = `node_modules
 dist
 .env`;
@@ -79,11 +80,15 @@ let TemplateService = class TemplateService {
             node_fs_1.default.mkdirSync(this.destination, { recursive: true });
         }
     }
+    toLogPath(pathString) {
+        return node_path_1.default.relative(process.cwd(), pathString.replaceAll("task-runner", this.outputName));
+    }
     async copyDirectories() {
         for (const folder of this.dirListToCopy) {
             const src = node_path_1.default.join(this.sourceDir, folder);
             const dest = node_path_1.default.join(this.destination, folder);
-            this.logger.debug(`Running Copy: cp -R ${src} ${dest}`);
+            // this.logger.debug(`Running Copy: cp -R ${src} ${dest}`);;
+            this.logger.debug(`Generating folder ${chalk_1.default.dim(this.toLogPath(dest))}`);
             node_fs_1.default.cpSync(src, dest, { recursive: true });
         }
     }
@@ -91,7 +96,8 @@ let TemplateService = class TemplateService {
         for (const filename of this.fileListToCopy) {
             const src = node_path_1.default.join(this.sourceDir, filename);
             const dest = node_path_1.default.join(this.destination, filename);
-            this.logger.debug(`Running Copy: cp ${src} ${dest}`);
+            // this.logger.debug(`Running Copy: cp ${src} ${dest}`);
+            this.logger.debug(`Generating file ${chalk_1.default.dim(this.toLogPath(dest))}`);
             node_fs_1.default.copyFileSync(src, dest);
         }
     }
@@ -122,7 +128,7 @@ let TemplateService = class TemplateService {
         const rename = (ext = "") => {
             const src = node_path_1.default.join(this.destination, `task-runner${ext}`);
             const dest = node_path_1.default.join(this.destination, `${this.outputName}${ext}`);
-            this.logger.debug(`Renaming task-runner to ${this.outputName}${ext}`);
+            this.logger.debug(`Fixing references ${chalk_1.default.dim(`(${this.outputName}${ext})`)}`);
             node_fs_1.default.renameSync(src, dest);
         };
         rename();

package/dist/src/services/templater-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"templater-service.js","sourceRoot":"./src/","sources":["src/services/templater-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"templater-service.js","sourceRoot":"./src/","sources":["src/services/templater-service.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,17 @@
 import { AppState } from "../../types/state";
-import GenerateAppTask from "../../wrappers/gen-app-task";
+import { ProjectService } from "../../services/project-service";
+import { AppTask } from "../../wrappers/app-task";
+import { FileService } from "../../services/file-service";
+import { UtilService } from "../../services/util-service";
 /**
  * Generates a new command class
  */
-export default class GenerateCommand extends GenerateAppTask {
+export default class GenerateCommand extends AppTask {
+    private fileService;
+    private projectService;
+    private utilService;
     loggerName: string;
+    constructor(fileService: FileService, projectService: ProjectService, utilService: UtilService);
     /**
      * Generates a new command class file.
      *
@@ -13,7 +20,7 @@ export default class GenerateCommand extends GenerateAppTask {
     run(): Promise<void | Partial<AppState>>;
     /**
      * Checks state for required fields. Executes prior to run method.
-     * Skips validation if genTargetType is not set to command.
+     * Skips validation if genData.targetType is not set to command.
      */
     preRun(): Promise<void>;
 }

package/dist/src/tasks/generate/generate-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-command.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/generate-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAK5D,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1D,UAAU,SAAsB;IAEhC;;;;OAIG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAgC9C;;;OAGG;IACG,MAAM;CAcb"}
+{"version":3,"file":"generate-command.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/generate-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAI5D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAAO;IAIhD,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;IALrB,UAAU,SAAsB;gBAGtB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW;IAKlC;;;;OAIG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAgC9C;;;OAGG;IACG,MAAM;CAcb"}

package/dist/src/tasks/generate/generate-command.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,12 +19,23 @@ const format_1 = require("../../types/format");
 const path_1 = __importDefault(require("path"));
 const command_1 = require("../../templates/command");
 const project_service_1 = require("../../services/project-service");
-const gen_app_task_1 = __importDefault(require("../../wrappers/gen-app-task"));
+const app_task_1 = require("../../wrappers/app-task");
+const file_service_1 = require("../../services/file-service");
+const util_service_1 = require("../../services/util-service");
 /**
  * Generates a new command class
  */
-let GenerateCommand = class GenerateCommand extends gen_app_task_1.default {
+let GenerateCommand = class GenerateCommand extends app_task_1.AppTask {
+    fileService;
+    projectService;
+    utilService;
     loggerName = "Generate Command";
+    constructor(fileService, projectService, utilService) {
+        super();
+        this.fileService = fileService;
+        this.projectService = projectService;
+        this.utilService = utilService;
+    }
     /**
      * Generates a new command class file.
      *
@@ -29,20 +43,19 @@ let GenerateCommand = class GenerateCommand extends gen_app_task_1.default {
      */
     async run() {
         const { utilService, fileService, projectService } = this;
-        if (this.state.data.genTargetType !== state_1.GenTargetType.Command) {
+        if (this.state.data.genData.targetType !== state_1.GenTargetType.Command) {
             return; // no-op
         }
         this.logger.info(chalk_1.default.blueBright("Generating Command"));
-        const targetName = this.state.data.genTargetName;
+        const targetName = this.state.data.genData.targetName;
         const targetDirectory = this.state.data.project.commandDestination;
         // detect case between commands and task files
         const convention = projectService.getConvention();
         this.logger.debug(`Using convention: ${chalk_1.default.magentaBright(convention)}`);
         const className = utilService.titleizedToCase(targetName, format_1.CaseType.PASCAL_CASE);
         const filename = `${utilService.titleizedToCase(targetName, convention)}${project_service_1.ProjectService.defaults.extention}`;
-        const injectableMappings = new Map();
-        await this.addTasksToMap(injectableMappings);
-        const rendered = (0, command_1.getCommandTemplate)(className, injectableMappings);
+        const injectablesMap = this.projectService.getImportMap(this.state.data.genData);
+        const rendered = (0, command_1.getCommandTemplate)(className, injectablesMap);
         const destination = path_1.default.join(targetDirectory, filename);
         // write contents
         fileService.writeFile(destination, rendered);
@@ -50,13 +63,13 @@ let GenerateCommand = class GenerateCommand extends gen_app_task_1.default {
     }
     /**
      * Checks state for required fields. Executes prior to run method.
-     * Skips validation if genTargetType is not set to command.
+     * Skips validation if genData.targetType is not set to command.
      */
     async preRun() {
-        if (this.state.data.genTargetType !== state_1.GenTargetType.Command) {
+        if (this.state.data.genData.targetType !== state_1.GenTargetType.Command) {
             return; // no validation on no-op flow
         }
-        if (!this.state.data.genTargetName) {
+        if (!this.state.data.genData.targetName) {
             throw new Error("Unable to determine targetName");
         }
         if (!this.state.data.project) {
@@ -68,7 +81,10 @@ let GenerateCommand = class GenerateCommand extends gen_app_task_1.default {
     }
 };
 GenerateCommand = __decorate([
-    (0, tsyringe_1.autoInjectable)()
+    (0, tsyringe_1.autoInjectable)(),
+    __metadata("design:paramtypes", [file_service_1.FileService,
+        project_service_1.ProjectService,
+        util_service_1.UtilService])
 ], GenerateCommand);
 exports.default = GenerateCommand;
 //# sourceMappingURL=generate-command.js.map

package/dist/src/tasks/generate/generate-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-command.js","sourceRoot":"./src/","sources":["src/tasks/generate/generate-command.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,kDAA0B;AAC1B,uCAA0C;AAC1C,6CAA4D;AAC5D,+CAA8C;AAC9C,gDAAwB;AACxB,qDAA6D;AAC7D,oEAAgE;AAChE,+EAA0D;AAE1D;;GAEG;AAEY,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sBAAe;IAC1D,UAAU,GAAG,kBAAkB,CAAC;IAEhC;;;;OAIG;IACH,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAE1D,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,KAAK,qBAAa,CAAC,OAAO,EAAE,CAAC;YAC5D,OAAO,CAAC,QAAQ;QAClB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAK,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAc,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,kBAAmB,CAAC;QAErE,8CAA8C;QAC9C,MAAM,UAAU,GAAG,cAAc,CAAC,aAAa,EAAE,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,eAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,WAAW,CAAC,eAAe,CAC3C,UAAU,EACV,iBAAQ,CAAC,WAAW,CACrB,CAAC;QACF,MAAM,QAAQ,GAAG,GAAG,WAAW,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,gCAAc,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QAE9G,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACrD,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;QAE7C,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAEzD,iBAAiB;QACjB,WAAW,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC7C,OAAO,EAAE,IAAI,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,EAAE,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,KAAK,qBAAa,CAAC,OAAO,EAAE,CAAC;YAC5D,OAAO,CAAC,8BAA8B;QACxC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;CACF,CAAA;AA1DoB,eAAe;IADnC,IAAA,yBAAc,GAAE;GACI,eAAe,CA0DnC;kBA1DoB,eAAe"}
+{"version":3,"file":"generate-command.js","sourceRoot":"./src/","sources":["src/tasks/generate/generate-command.ts"],"names":[],"mappings":"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"}

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

@@ -1,9 +1,16 @@
-import GenerateAppTask from "../../wrappers/gen-app-task";
+import { ProjectService } from "../../services/project-service";
+import { AppTask } from "../../wrappers/app-task";
+import { FileService } from "../../services/file-service";
+import { UtilService } from "../../services/util-service";
 /**
  * Generates a new service class
  */
-export default class GenerateService extends GenerateAppTask {
+export default class GenerateService extends AppTask {
+    private fileService;
+    private projectService;
+    private utilService;
     loggerName: string;
+    constructor(fileService: FileService, projectService: ProjectService, utilService: UtilService);
     /**
      * Generates a new service class file.
      *
@@ -16,7 +23,7 @@ export default class GenerateService extends GenerateAppTask {
     } | undefined>;
     /**
      * Checks state for required fields. Executes prior to run method.
-     * Skips validation if genTargetType is not set to service.
+     * Skips validation if genData.targetType is not set to service.
      */
     preRun(): Promise<void>;
 }

package/dist/src/tasks/generate/generate-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-service.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/generate-service.ts"],"names":[],"mappings":"AAOA,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1D,UAAU,SAAsB;IAEhC;;;;OAIG;IACG,GAAG;;;;;IAgCT;;;OAGG;IACG,MAAM;CAcb"}
+{"version":3,"file":"generate-service.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/generate-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIhE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAAO;IAIhD,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;IALrB,UAAU,SAAsB;gBAGtB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW;IAKlC;;;;OAIG;IACG,GAAG;;;;;IA+BT;;;OAGG;IACG,MAAM;CAcb"}

package/dist/src/tasks/generate/generate-service.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,33 +19,41 @@ const project_service_1 = require("../../services/project-service");
 const format_1 = require("../../types/format");
 const path_1 = __importDefault(require("path"));
 const service_1 = require("../../templates/service");
-const gen_app_task_1 = __importDefault(require("../../wrappers/gen-app-task"));
+const app_task_1 = require("../../wrappers/app-task");
+const file_service_1 = require("../../services/file-service");
+const util_service_1 = require("../../services/util-service");
 /**
  * Generates a new service class
  */
-let GenerateService = class GenerateService extends gen_app_task_1.default {
+let GenerateService = class GenerateService extends app_task_1.AppTask {
+    fileService;
+    projectService;
+    utilService;
     loggerName = "Generate Service";
+    constructor(fileService, projectService, utilService) {
+        super();
+        this.fileService = fileService;
+        this.projectService = projectService;
+        this.utilService = utilService;
+    }
     /**
      * Generates a new service class file.
      *
      * @returns updated state with outputDestination set to a generated result path.
      */
     async run() {
-        if (this.state.data.genTargetType !== state_1.GenTargetType.Service) {
+        if (this.state.data.genData.targetType !== state_1.GenTargetType.Service) {
             return;
         }
         this.logger.info(chalk_1.default.blueBright("Generating Service"));
         const { utilService, projectService } = this;
-        const targetName = this.state.data.genTargetName;
+        const targetName = this.state.data.genData.targetName;
         const targetDirectory = this.state.data.project.serviceDestination;
         // detect case
         const convention = projectService.getConvention();
         this.logger.debug(`Using convention: ${chalk_1.default.magentaBright(convention)}`);
         const className = utilService.titleizedToCase(targetName, format_1.CaseType.PASCAL_CASE);
-        const injectableMappings = new Map();
-        if (this.argService.hasFlag("inject")) {
-            await this.addServicesToMap(injectableMappings, targetDirectory);
-        }
+        const injectableMappings = this.projectService.getImportMap(this.state.data.genData);
         const rendered = (0, service_1.getServiceTemplate)(className, injectableMappings);
         const filename = `${utilService.titleizedToCase(targetName, convention)}${project_service_1.ProjectService.defaults.extention}`;
         const destination = path_1.default.join(targetDirectory, filename);
@@ -52,13 +63,13 @@ let GenerateService = class GenerateService extends gen_app_task_1.default {
     }
     /**
      * Checks state for required fields. Executes prior to run method.
-     * Skips validation if genTargetType is not set to service.
+     * Skips validation if genData.targetType is not set to service.
      */
     async preRun() {
-        if (this.state.data.genTargetType !== state_1.GenTargetType.Service) {
+        if (this.state.data.genData.targetType !== state_1.GenTargetType.Service) {
             return; // no validation on no-op flow
         }
-        if (!this.state.data.genTargetName) {
+        if (!this.state.data.genData.targetName) {
             throw new Error("Unable to determine targetName");
         }
         if (!this.state.data.project) {
@@ -70,7 +81,10 @@ let GenerateService = class GenerateService extends gen_app_task_1.default {
     }
 };
 GenerateService = __decorate([
-    (0, tsyringe_1.autoInjectable)()
+    (0, tsyringe_1.autoInjectable)(),
+    __metadata("design:paramtypes", [file_service_1.FileService,
+        project_service_1.ProjectService,
+        util_service_1.UtilService])
 ], GenerateService);
 exports.default = GenerateService;
 //# sourceMappingURL=generate-service.js.map

package/dist/src/tasks/generate/generate-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-service.js","sourceRoot":"./src/","sources":["src/tasks/generate/generate-service.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,kDAA0B;AAC1B,uCAA0C;AAC1C,6CAAkD;AAClD,oEAAgE;AAChE,+CAA8C;AAC9C,gDAAwB;AACxB,qDAA6D;AAC7D,+EAA0D;AAE1D;;GAEG;AAEY,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sBAAe;IAC1D,UAAU,GAAG,kBAAkB,CAAC;IAEhC;;;;OAIG;IACH,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,KAAK,qBAAa,CAAC,OAAO,EAAE,CAAC;YAC5D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAK,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACzD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAc,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,kBAAmB,CAAC;QAErE,cAAc;QACd,MAAM,UAAU,GAAG,cAAc,CAAC,aAAa,EAAE,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,eAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,WAAW,CAAC,eAAe,CAC3C,UAAU,EACV,iBAAQ,CAAC,WAAW,CACrB,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACrD,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,GAAG,WAAW,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,gCAAc,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC9G,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAEzD,iBAAiB;QACjB,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAClD,OAAO,EAAE,IAAI,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,EAAE,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,KAAK,qBAAa,CAAC,OAAO,EAAE,CAAC;YAC5D,OAAO,CAAC,8BAA8B;QACxC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;CACF,CAAA;AA1DoB,eAAe;IADnC,IAAA,yBAAc,GAAE;GACI,eAAe,CA0DnC;kBA1DoB,eAAe"}
+{"version":3,"file":"generate-service.js","sourceRoot":"./src/","sources":["src/tasks/generate/generate-service.ts"],"names":[],"mappings":"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"}

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

@@ -1,9 +1,16 @@
-import GenAppTask from "../../wrappers/gen-app-task";
+import { ProjectService } from "../../services/project-service";
+import { AppTask } from "../../wrappers/app-task";
+import { FileService } from "../../services/file-service";
+import { UtilService } from "../../services/util-service";
 /**
  * Generates a new task class
  */
-export default class GenerateTask extends GenAppTask {
+export default class GenerateTask extends AppTask {
+    private fileService;
+    private projectService;
+    private utilService;
     loggerName: string;
+    constructor(fileService: FileService, projectService: ProjectService, utilService: UtilService);
     /**
      * Generates a new task class file.
      *
@@ -16,7 +23,7 @@ export default class GenerateTask extends GenAppTask {
     } | undefined>;
     /**
      * Checks state for required fields. Executes prior to run method.
-     * Skips validation if genTargetType is not set to task.
+     * Skips validation if genData.targetType is not set to task.
      */
     preRun(): Promise<void>;
 }

package/dist/src/tasks/generate/generate-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-task.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/generate-task.ts"],"names":[],"mappings":"AAOA,OAAO,UAAU,MAAM,6BAA6B,CAAC;AAErD;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IAClD,UAAU,SAAmB;IAE7B;;;;OAIG;IACG,GAAG;;;;;IAiCT;;;OAGG;IACG,MAAM;CAcb"}
+{"version":3,"file":"generate-task.d.ts","sourceRoot":"./src/","sources":["src/tasks/generate/generate-task.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAI7C,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;IALrB,UAAU,SAAmB;gBAGnB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW;IAKlC;;;;OAIG;IACG,GAAG;;;;;IAgCT;;;OAGG;IACG,MAAM;CAcb"}