task-script-support-cli 0.2.20 → 0.3.2

package/dist/src/tasks/sync-configuration.js.map

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

package/dist/src/templates/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"./src/","sources":["src/templates/command.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,GAC7B,WAAW,MAAM,EACjB,QAAO,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,WAevC,CAAC"}
+{"version":3,"file":"command.d.ts","sourceRoot":"./src/","sources":["src/templates/command.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,kBAAkB,GAC7B,WAAW,MAAM,EACjB,QAAO,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,WAmBvC,CAAC"}

package/dist/src/templates/command.js

@@ -1,17 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommandTemplate = void 0;
+const nonClashingName = (name) => `${name}Task`;
+const nameCheck = (name, className) => name === className ? nonClashingName(name) : name;
 const getCommandTemplate = (className, tasks = new Map()) => `import { singleton } from "tsyringe";
 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/dist/src/templates/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"./src/","sources":["src/templates/command.ts"],"names":[],"mappings":";;;AAAO,MAAM,kBAAkB,GAAG,CAChC,SAAiB,EACjB,QAA6B,IAAI,GAAG,EAAE,EACtC,EAAE,CACF;;EAEA,KAAK;KACJ,IAAI,EAAE;KACN,OAAO,EAAE;KACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;KACjD,IAAI,CAAC,IAAI,CAAC;;;eAGE,SAAS;aACX,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;;;CAG7C,CAAC;AAjBW,QAAA,kBAAkB,sBAiB7B"}
+{"version":3,"file":"command.js","sourceRoot":"./src/","sources":["src/templates/command.ts"],"names":[],"mappings":";;;AAAA,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,IAAI,MAAM,CAAC;AACxD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAE,EAAE,CACpD,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAE7C,MAAM,kBAAkB,GAAG,CAChC,SAAiB,EACjB,QAA6B,IAAI,GAAG,EAAE,EACtC,EAAE,CACF;;EAEA,KAAK;KACJ,IAAI,EAAE;KACN,OAAO,EAAE;KACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,UAAU,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;KACvE,IAAI,CAAC,IAAI,CAAC;;;eAGE,SAAS;aACX,KAAK;KACb,IAAI,EAAE;KACN,OAAO,EAAE;KACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;KACnC,IAAI,CAAC,IAAI,CAAC;;;CAGd,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B"}

package/dist/src/templates/service.d.ts

@@ -1,2 +1,2 @@
-export declare const getServiceTemplate: (className: string) => string;
+export declare const getServiceTemplate: (className: string, injections: Map<string, string>) => string;
 //# sourceMappingURL=service.d.ts.map

package/dist/src/templates/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"./src/","sources":["src/templates/service.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,GAAI,WAAW,MAAM,WAWnD,CAAC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"./src/","sources":["src/templates/service.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,GAC7B,WAAW,MAAM,EACjB,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,WAuChC,CAAC"}

package/dist/src/templates/service.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceTemplate = void 0;
-const getServiceTemplate = (className) => `import { singleton } from "tsyringe";
+const camelCase = (s) => s.charAt(0).toLowerCase() + s.slice(1);
+const getServiceTemplate = (className, injections) => {
+    if (!injections || injections.size === 0) {
+        return `import { singleton } from "tsyringe";
 
 /**
  * ${className}
@@ -12,5 +15,30 @@ 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    ")}
+  ) {}
+}
+
+`;
+};
 exports.getServiceTemplate = getServiceTemplate;
 //# sourceMappingURL=service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"./src/","sources":["src/templates/service.ts"],"names":[],"mappings":";;;AAAO,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAE,EAAE,CACtD;;;KAGG,SAAS;;;eAGC,SAAS;;;;CAIvB,CAAC;AAXW,QAAA,kBAAkB,sBAW7B"}
+{"version":3,"file":"service.js","sourceRoot":"./src/","sources":["src/templates/service.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,kBAAkB,GAAG,CAChC,SAAiB,EACjB,UAA+B,EAC/B,EAAE;IACF,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO;;;KAGN,SAAS;;;eAGC,SAAS;;;;CAIvB,CAAC;IACA,CAAC;IAED,OAAO;EACP,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;;;;KAIR,SAAS;;;eAGC,SAAS;;MAElB,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;;;;CAIrB,CAAC;AACF,CAAC,CAAC;AAzCW,QAAA,kBAAkB,sBAyC7B"}

package/dist/src/templates/task.d.ts

@@ -1,2 +1,2 @@
-export declare const getTaskTemplate: (className: string) => string;
+export declare const getTaskTemplate: (className: string, injections: Map<string, string>) => string;
 //# sourceMappingURL=task.d.ts.map

package/dist/src/templates/task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task.d.ts","sourceRoot":"./src/","sources":["src/templates/task.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,GAAI,WAAW,MAAM,WAehD,CAAC"}
+{"version":3,"file":"task.d.ts","sourceRoot":"./src/","sources":["src/templates/task.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,GAC1B,WAAW,MAAM,EACjB,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,WAmDhC,CAAC"}

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/types/state.d.ts

@@ -1,17 +1,21 @@
 import { CLIArg } from "./process";
 import { AppState as State, TaskClass } from "task-script-support";
-import { ProjectConfig, ProjectData } from "./project";
+import { ProjectConfig, ProjectData, ProjectImport } from "./project";
 export declare enum GenTargetType {
     Command = "command",
     Service = "service",
     Task = "task"
 }
+export interface GenData {
+    readonly targetType?: GenTargetType;
+    readonly targetName?: string;
+    readonly imports?: ProjectImport[];
+}
 export interface AppStateData {
     readonly banner?: {
         readonly font?: string;
     };
-    readonly genTargetType?: GenTargetType;
-    readonly genTargetName?: string;
+    readonly genData?: GenData;
     readonly environmentValidated?: boolean;
     readonly project?: ProjectConfig & ProjectData;
     readonly errorMessages?: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"./src/","sources":["src/types/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAEvD,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE;QAChB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;IAE/C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,qBAAqB;;;;;;;CAOjC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC"}
+{"version":3,"file":"state.d.ts","sourceRoot":"./src/","sources":["src/types/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAEtE,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACpC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE;QAChB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IAEF,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;IAE/C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,qBAAqB;;;;;;;CAOjC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC"}

package/dist/src/types/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"./src/","sources":["src/types/state.ts"],"names":[],"mappings":";;;AAIA,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;IACnB,8BAAa,CAAA;AACf,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAgBY,QAAA,qBAAqB,GAAG;IACnC,iBAAiB,EAAE,mBAAmB;IACtC,cAAc,EAAE,gBAAgB;IAChC,QAAQ,EAAE,UAAU;IACpB,iBAAiB,EAAE,mBAAmB;IACtC,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;CAC3C,CAAC"}
+{"version":3,"file":"state.js","sourceRoot":"./src/","sources":["src/types/state.ts"],"names":[],"mappings":";;;AAIA,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;IACnB,8BAAa,CAAA;AACf,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAsBY,QAAA,qBAAqB,GAAG;IACnC,iBAAiB,EAAE,mBAAmB;IACtC,cAAc,EAAE,gBAAgB;IAChC,QAAQ,EAAE,UAAU;IACpB,iBAAiB,EAAE,mBAAmB;IACtC,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;CAC3C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "task-script-support-cli",
-  "version": "0.2.20",
+  "version": "0.3.2",
   "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/commands/gen.ts

@@ -10,6 +10,7 @@ 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";
 
 @singleton()
 export class GenCommand extends Command {
@@ -20,6 +21,7 @@ export class GenCommand extends Command {
     SelectGenTarget,
     SyncConfiguration,
     SelectGenTargetName,
+    ResolveInjectables,
     [GenerateCommand, GenerateService, GenerateTask],
     PrintGeneratedResults,
   ];

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/services/project-service.ts

@@ -2,6 +2,8 @@ import { autoInjectable } from "tsyringe";
 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";
 
 @autoInjectable()
 export class ProjectService {
@@ -17,6 +19,42 @@ export class ProjectService {
     private 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[] {
+    if (!selectedPaths?.length) {
+      return [];
+    }
+    const formalizedPaths: ProjectImport[] = [];
+    for (const fullPath of selectedPaths) {
+      const filename = this.fileService.getFilenameNoExt(fullPath);
+      const importClassName = this.utilService.titleizedToCase(
+        this.utilService.titleizeAll(filename),
+        CaseType.PASCAL_CASE,
+      );
+
+      formalizedPaths.push({
+        importClassName,
+        importPath: this.fileService
+          .toRelativePath(relativeSource, fullPath)
+          .replace(ProjectService.defaults.extention, ""),
+      });
+    }
+    return formalizedPaths;
+  }
+
   /**
    * Get all task files found in the project
    *
@@ -46,6 +84,22 @@ export class ProjectService {
     ];
   }
 
+  /**
+   * 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) {
+    const imports = genData.imports || [];
+    return new Map<string, string>(
+      imports.map((imp: ProjectImport) => [
+        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/src/services/templater-service.ts

@@ -4,6 +4,7 @@ import { autoInjectable } from "tsyringe";
 import { SpawnService } from "./spawn-service";
 import { LogService } from "./log-service";
 import { dockerIgnoreTemplate } from "../templates/docker-ignore";
+import chalk from "chalk";
 
 const gitignoreContent = `node_modules
 dist
@@ -78,11 +79,19 @@ export class TemplateService {
     }
   }
 
+  toLogPath(pathString: string) {
+    return path.relative(
+      process.cwd(),
+      pathString.replaceAll("task-runner", this.outputName),
+    );
+  }
+
   private async copyDirectories() {
     for (const folder of this.dirListToCopy) {
       const src = path.join(this.sourceDir, folder);
       const dest = path.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.dim(this.toLogPath(dest))}`);
       fs.cpSync(src, dest, { recursive: true });
     }
   }
@@ -91,7 +100,8 @@ export class TemplateService {
     for (const filename of this.fileListToCopy) {
       const src = path.join(this.sourceDir, filename);
       const dest = path.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.dim(this.toLogPath(dest))}`);
       fs.copyFileSync(src, dest);
     }
   }
@@ -135,7 +145,9 @@ export class TemplateService {
     const rename = (ext = "") => {
       const src = path.join(this.destination, `task-runner${ext}`);
       const dest = path.join(this.destination, `${this.outputName}${ext}`);
-      this.logger.debug(`Renaming task-runner to ${this.outputName}${ext}`);
+      this.logger.debug(
+        `Fixing references ${chalk.dim(`(${this.outputName}${ext})`)}`,
+      );
       fs.renameSync(src, dest);
     };
     rename();

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

@@ -1,14 +1,13 @@
 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 { AppTask } from "../../wrappers/app-task";
+import { FileService } from "../../services/file-service";
+import { UtilService } from "../../services/util-service";
 
 /**
  * Generates a new command class
@@ -19,9 +18,8 @@ export default class GenerateCommand extends AppTask {
 
   constructor(
     private fileService: FileService,
-    private utilService: UtilService,
     private projectService: ProjectService,
-    private promptService: PromptService,
+    private utilService: UtilService,
   ) {
     super();
   }
@@ -29,17 +27,17 @@ export default class GenerateCommand extends AppTask {
   /**
    * 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;
 
-    if (this.state.data.genTargetType !== GenTargetType.Command) {
+    if (this.state.data.genData!.targetType !== GenTargetType.Command) {
       return; // no-op
     }
 
     this.logger.info(chalk.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
@@ -52,9 +50,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 injectablesMap = this.projectService.getImportMap(
+      this.state.data.genData!,
+    );
+    const rendered = getCommandTemplate(className, injectablesMap);
     const destination = path.join(targetDirectory, filename);
 
     // write contents
@@ -64,13 +63,13 @@ export default class GenerateCommand extends AppTask {
 
   /**
    * 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 !== GenTargetType.Command) {
+    if (this.state.data.genData!.targetType !== 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) {
@@ -80,56 +79,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,13 +1,13 @@
 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 { AppTask } from "../../wrappers/app-task";
+import { FileService } from "../../services/file-service";
+import { UtilService } from "../../services/util-service";
 
 /**
  * Generates a new service class
@@ -17,9 +17,9 @@ export default class GenerateService extends AppTask {
   loggerName = "Generate Service";
 
   constructor(
+    private fileService: FileService,
     private projectService: ProjectService,
     private utilService: UtilService,
-    private fileService: FileService,
   ) {
     super();
   }
@@ -27,17 +27,17 @@ export default class GenerateService extends AppTask {
   /**
    * 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) {
+    if (this.state.data.genData!.targetType !== GenTargetType.Service) {
       return;
     }
 
     this.logger.info(chalk.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
@@ -48,7 +48,10 @@ export default class GenerateService extends AppTask {
       CaseType.PASCAL_CASE,
     );
 
-    const rendered = getServiceTemplate(className);
+    const injectableMappings = this.projectService.getImportMap(
+      this.state.data.genData!,
+    );
+    const rendered = getServiceTemplate(className, injectableMappings);
     const filename = `${utilService.titleizedToCase(targetName, convention)}${ProjectService.defaults.extention}`;
     const destination = path.join(targetDirectory, filename);
 
@@ -59,13 +62,13 @@ export default class GenerateService extends AppTask {
 
   /**
    * 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 !== GenTargetType.Service) {
+    if (this.state.data.genData!.targetType !== 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) {