@tsed/cli-core 6.6.2 → 7.0.0-alpha.1

package/lib/esm/CliCore.js

@@ -1,10 +1,8 @@
-var CliCore_1;
-import { __decorate } from "tslib";
 import "@tsed/logger-std";
-// import "@tsed/logger/layouts/ColoredLayout";
 import { join, resolve } from "node:path";
 import { Type } from "@tsed/core";
-import { inject, InjectorService, Module } from "@tsed/di";
+import { inject, injectable, InjectorService } from "@tsed/di";
+import { $asyncEmit } from "@tsed/hooks";
 import chalk from "chalk";
 import { Command } from "commander";
 import semver from "semver";
@@ -20,7 +18,7 @@ import { resolveConfiguration } from "./utils/resolveConfiguration.js";
 function isHelpManual(argv) {
     return argv.includes("-h") || argv.includes("--help");
 }
-let CliCore = CliCore_1 = class CliCore {
+export class CliCore {
     constructor() {
         this.injector = inject(InjectorService);
         this.cliService = inject(CliService);
@@ -38,26 +36,26 @@ let CliCore = CliCore_1 = class CliCore {
         }
         return this;
     }
-    static async create(settings, module = CliCore_1) {
+    static async create(settings, module = CliCore) {
         settings = resolveConfiguration(settings);
         const injector = this.createInjector(settings);
         settings.plugins && (await loadPlugins());
         await this.loadInjector(injector, module);
-        await injector.emit("$onReady");
-        return injector.get(CliCore_1);
+        await $asyncEmit("$onReady");
+        return inject(CliCore);
     }
-    static async bootstrap(settings, module = CliCore_1) {
+    static async bootstrap(settings, module = CliCore) {
         const cli = await this.create(settings, module);
         return cli.bootstrap();
     }
-    static async loadInjector(injector, module = CliCore_1) {
+    static async loadInjector(injector, module = CliCore) {
         await injector.emit("$beforeInit");
-        injector.addProvider(CliCore_1, {
+        injector.addProvider(CliCore, {
             useClass: module
         });
         await injector.load();
         await injector.invoke(module);
-        await injector.emit("$afterInit");
+        await $asyncEmit("$afterInit");
         injector.settings.set("loaded", true);
     }
     static async updateNotifier(pkg) {
@@ -94,10 +92,5 @@ let CliCore = CliCore_1 = class CliCore {
         }
         return this;
     }
-};
-CliCore = CliCore_1 = __decorate([
-    Module({
-        imports: [CliPackageJson, ProjectPackageJson, CliService, CliConfiguration]
-    })
-], CliCore);
-export { CliCore };
+}
+injectable(CliCore).imports([CliPackageJson, ProjectPackageJson, CliService, CliConfiguration]);

package/lib/esm/decorators/command.js

@@ -1,6 +1,6 @@
-import { StoreSet, useDecorators } from "@tsed/core";
-import { Injectable } from "@tsed/di";
-import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
+import { command } from "../fn/command.js";
 export function Command(options) {
-    return useDecorators(Injectable({ type: "command" }), StoreSet(CommandStoreKeys.COMMAND, options));
+    return (token) => {
+        command(token, options);
+    };
 }

package/lib/esm/fn/command.js

@@ -0,0 +1,5 @@
+import { injectable } from "@tsed/di";
+import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
+export function command(token, options) {
+    return injectable(token).type("command").set(CommandStoreKeys.COMMAND, options);
+}

package/lib/esm/index.js

@@ -2,6 +2,7 @@ import "./utils/patchCommander.js";
 import Inquirer from "inquirer";
 export * from "./CliCore.js";
 export * from "./decorators/index.js";
+export * from "./fn/command.js";
 export * from "./interfaces/index.js";
 export * from "./packageManagers/index.js";
 export * from "./services/index.js";

package/lib/esm/interfaces/CommandData.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/interfaces/CommandProvider.js

@@ -1 +1,2 @@
-export {};
+import "inquirer-autocomplete-prompt";
+import AutocompletePrompt from "inquirer-autocomplete-prompt";

package/lib/esm/interfaces/index.js

@@ -1,5 +1,6 @@
 import { Type } from "@tsed/core";
 export * from "./CliDefaultOptions.js";
+export * from "./CommandData.js";
 export * from "./CommandMetadata.js";
 export * from "./CommandParameters.js";
 export * from "./CommandProvider.js";

package/lib/esm/packageManagers/PackageManagersModule.js

@@ -1,5 +1,5 @@
 import { __decorate, __metadata, __param } from "tslib";
-import { Inject, Injectable } from "@tsed/di";
+import { Inject, injectable } from "@tsed/di";
 import { EMPTY, throwError } from "rxjs";
 import { catchError } from "rxjs/operators";
 import { ProjectPackageJson } from "../services/ProjectPackageJson.js";
@@ -122,10 +122,8 @@ __decorate([
     __metadata("design:type", ProjectPackageJson)
 ], PackageManagersModule.prototype, "projectPackageJson", void 0);
 PackageManagersModule = __decorate([
-    Injectable({
-        imports: [YarnManager, YarnBerryManager, NpmManager, PNpmManager, BunManager]
-    }),
     __param(0, Inject("package:manager")),
     __metadata("design:paramtypes", [Array])
 ], PackageManagersModule);
 export { PackageManagersModule };
+injectable(PackageManagersModule).imports([YarnManager, YarnBerryManager, NpmManager, PNpmManager, BunManager]);

package/lib/esm/services/CliConfiguration.js

@@ -1,6 +1,5 @@
-import { __decorate, __metadata } from "tslib";
-import { DIConfiguration, Injectable } from "@tsed/di";
-let CliConfiguration = class CliConfiguration extends DIConfiguration {
+import { DIConfiguration, injectable } from "@tsed/di";
+export class CliConfiguration extends DIConfiguration {
     constructor() {
         super({
             project: {
@@ -9,9 +8,5 @@ let CliConfiguration = class CliConfiguration extends DIConfiguration {
             }
         });
     }
-};
-CliConfiguration = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [])
-], CliConfiguration);
-export { CliConfiguration };
+}
+injectable(CliConfiguration);

package/lib/esm/services/CliDockerComposeYaml.js

@@ -1,12 +1,11 @@
-import { __decorate } from "tslib";
 import { join } from "node:path";
 import { setValue } from "@tsed/core";
-import { inject, Injectable } from "@tsed/di";
+import { inject, injectable } from "@tsed/di";
 import { snakeCase } from "change-case";
 import { CliFs } from "./CliFs.js";
 import { CliYaml } from "./CliYaml.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
-let CliDockerComposeYaml = class CliDockerComposeYaml {
+export class CliDockerComposeYaml {
     constructor() {
         this.cliYaml = inject(CliYaml);
         this.fs = inject(CliFs);
@@ -84,8 +83,5 @@ let CliDockerComposeYaml = class CliDockerComposeYaml {
             await this.write(dockerCompose);
         }
     }
-};
-CliDockerComposeYaml = __decorate([
-    Injectable()
-], CliDockerComposeYaml);
-export { CliDockerComposeYaml };
+}
+injectable(CliDockerComposeYaml);

package/lib/esm/services/CliExeca.js

@@ -1,11 +1,10 @@
-import { __decorate } from "tslib";
-import { Injectable } from "@tsed/di";
+import { injectable } from "@tsed/di";
 import { execa, execaSync } from "execa";
 import { filter, mergeWith } from "rxjs/operators";
 // @ts-ignore
 import split from "split";
 import { streamToObservable } from "../utils/streamToObservable.js";
-let CliExeca = class CliExeca {
+export class CliExeca {
     constructor() {
         this.raw = execa;
         this.rawSync = execaSync;
@@ -31,8 +30,5 @@ let CliExeca = class CliExeca {
     get(cmd, args, opts) {
         return this.rawSync(cmd, args, opts).stdout;
     }
-};
-CliExeca = __decorate([
-    Injectable()
-], CliExeca);
-export { CliExeca };
+}
+injectable(CliExeca);

package/lib/esm/services/CliFs.js

@@ -1,12 +1,17 @@
-import { __decorate } from "tslib";
 import { join } from "node:path";
-import { Injectable } from "@tsed/di";
+import { RealFileSystemHost } from "@ts-morph/common";
+import { injectable } from "@tsed/di";
 import { normalizePath } from "@tsed/normalize-path";
 import Fs, {} from "fs-extra";
-let CliFs = class CliFs {
+export class CliFs extends RealFileSystemHost {
     constructor() {
+        super(...arguments);
         this.raw = Fs;
     }
+    /**
+     * @deprecated
+     * @param path
+     */
     exists(path) {
         return this.raw.existsSync(path);
     }
@@ -14,10 +19,10 @@ let CliFs = class CliFs {
         return normalizePath(join(...args));
     }
     readFile(file, encoding) {
-        return this.raw.readFile(file, encoding);
+        return super.readFile(file, encoding);
     }
     readFileSync(file, encoding) {
-        return this.raw.readFileSync(file, encoding);
+        return super.readFileSync(file, encoding);
     }
     async readJson(file, encoding) {
         const content = await this.readFile(file, encoding);
@@ -30,6 +35,9 @@ let CliFs = class CliFs {
     async writeJson(file, data, options) {
         await this.raw.writeFile(file, JSON.stringify(data, null, 2), options || { encoding: "utf8" });
     }
+    writeJsonSync(file, data, options) {
+        this.raw.writeFileSync(file, JSON.stringify(data, null, 2), options || { encoding: "utf8" });
+    }
     writeFileSync(path, data, options) {
         return this.raw.writeFileSync(path, data, options);
     }
@@ -43,7 +51,7 @@ let CliFs = class CliFs {
         return this.raw.ensureDirSync(path, options);
     }
     findUpFile(root, file) {
-        return [join(root, file), join(root, "..", file), join(root, "..", "..", file), join(root, "..", "..", "..", file)].find((path) => this.exists(path));
+        return [join(root, file), join(root, "..", file), join(root, "..", "..", file), join(root, "..", "..", "..", file)].find((path) => this.fileExistsSync(path));
     }
     async importModule(mod, root = process.cwd()) {
         try {
@@ -60,8 +68,5 @@ let CliFs = class CliFs {
         }
         return import(mod);
     }
-};
-CliFs = __decorate([
-    Injectable()
-], CliFs);
-export { CliFs };
+}
+injectable(CliFs);

package/lib/esm/services/CliHooks.js

@@ -1,6 +1,5 @@
-import { __decorate } from "tslib";
-import { Injectable, injector } from "@tsed/di";
-let CliHooks = class CliHooks {
+import { injectable, injector } from "@tsed/di";
+export class CliHooks {
     async emit(hookName, cmd, ...args) {
         const inj = injector();
         const providers = inj.getProviders();
@@ -20,8 +19,5 @@ let CliHooks = class CliHooks {
         }
         return results.filter((o) => o !== undefined);
     }
-};
-CliHooks = __decorate([
-    Injectable()
-], CliHooks);
-export { CliHooks };
+}
+injectable(CliHooks);

package/lib/esm/services/CliHttpClient.js

@@ -1,13 +1,11 @@
-var CliHttpClient_1;
-import { __decorate } from "tslib";
 import { stringify } from "node:querystring";
 import { URL } from "node:url";
 import { cleanObject } from "@tsed/core";
-import { inject, Injectable } from "@tsed/di";
+import { inject, injectable } from "@tsed/di";
 import axios, {} from "axios";
 import { CliHttpLogClient } from "./CliHttpLogClient.js";
 import { CliProxyAgent } from "./CliProxyAgent.js";
-let CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClient {
+export class CliHttpClient extends CliHttpLogClient {
     constructor() {
         super(...arguments);
         this.cliProxyAgent = inject(CliProxyAgent);
@@ -80,7 +78,7 @@ let CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClie
         const startTime = new Date().getTime();
         try {
             const response = await axios({
-                paramsSerializer: CliHttpClient_1.getParamsSerializer,
+                paramsSerializer: CliHttpClient.getParamsSerializer,
                 ...options
             });
             this.onSuccess({ startTime, ...options });
@@ -96,8 +94,5 @@ let CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClie
         const data = !withHeaders ? result?.data : result;
         return withHeaders ? { data, headers: result?.headers } : data;
     }
-};
-CliHttpClient = CliHttpClient_1 = __decorate([
-    Injectable()
-], CliHttpClient);
-export { CliHttpClient };
+}
+injectable(CliHttpClient);

package/lib/esm/services/CliLoadFile.js

@@ -1,10 +1,9 @@
-import { __decorate, __metadata } from "tslib";
 import { extname } from "node:path";
-import { inject, Injectable } from "@tsed/di";
+import { inject, injectable } from "@tsed/di";
 import { default as Ajv } from "ajv";
 import { CliFs } from "./CliFs.js";
 import { CliYaml } from "./CliYaml.js";
-let CliLoadFile = class CliLoadFile {
+export class CliLoadFile {
     // @ts-ignore
     #ajv;
     constructor() {
@@ -49,9 +48,5 @@ let CliLoadFile = class CliLoadFile {
         }
         return config;
     }
-};
-CliLoadFile = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [])
-], CliLoadFile);
-export { CliLoadFile };
+}
+injectable(CliLoadFile);

package/lib/esm/services/CliPackageJson.js

@@ -1,4 +1,4 @@
-import { Configuration, Inject, inject, registerProvider } from "@tsed/di";
+import { constant, Inject, inject, injectable } from "@tsed/di";
 import {} from "../interfaces/PackageJson.js";
 export function CliPackageJson() {
     return Inject(CliPackageJson);
@@ -6,10 +6,6 @@ export function CliPackageJson() {
 export function cliPackageJson() {
     return inject(CliPackageJson);
 }
-registerProvider({
-    provide: CliPackageJson,
-    deps: [Configuration],
-    useFactory(configuration) {
-        return configuration.get("pkg", {});
-    }
+injectable(CliPackageJson).factory(() => {
+    return constant("pkg", {});
 });

package/lib/esm/services/CliPlugins.js

@@ -1,5 +1,4 @@
-import { __decorate } from "tslib";
-import { constant, inject, Injectable } from "@tsed/di";
+import { constant, inject, injectable } from "@tsed/di";
 import chalk from "chalk";
 import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
 import { PackageManagersModule } from "../packageManagers/PackageManagersModule.js";
@@ -15,7 +14,7 @@ function mapPlugins({ package: { name, description = "", ...otherProps } }) {
         ...otherProps
     };
 }
-let CliPlugins = class CliPlugins {
+export class CliPlugins {
     constructor() {
         this.name = constant("name", "");
         this.loadPlugins = loadPlugins;
@@ -57,8 +56,5 @@ let CliPlugins = class CliPlugins {
     isPlugin(name) {
         return name.startsWith(`@${this.name}/cli-plugin`) || name.includes(`${this.name}-cli-plugin`);
     }
-};
-CliPlugins = __decorate([
-    Injectable()
-], CliPlugins);
-export { CliPlugins };
+}
+injectable(CliPlugins);

package/lib/esm/services/CliProxyAgent.js

@@ -1,14 +1,13 @@
-import { __decorate } from "tslib";
 import { URL } from "node:url";
-import { Configuration, Inject, inject, Injectable, refValue } from "@tsed/di";
+import { inject, injectable, refValue } from "@tsed/di";
 import { camelCase } from "change-case";
 import { coerce } from "../utils/coerce.js";
 import { CliExeca } from "./CliExeca.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
-let CliProxyAgent = class CliProxyAgent {
+export class CliProxyAgent {
     constructor() {
         this.proxySettings = refValue("proxy", {});
-        this.projectPackageJson = Inject(ProjectPackageJson);
+        this.projectPackageJson = inject(ProjectPackageJson);
         this.cliExeca = inject(CliExeca);
     }
     async $onInit() {
@@ -73,14 +72,10 @@ let CliProxyAgent = class CliProxyAgent {
             };
         }
     }
-};
-CliProxyAgent = __decorate([
-    Injectable(),
-    Configuration({
-        proxy: {
-            url: process.env.HTTPS_PROXY || process.env.HTTP_PROXY,
-            strictSsl: process.env.NODE_TLS_REJECT_UNAUTHORIZED !== undefined ? process.env.NODE_TLS_REJECT_UNAUTHORIZED !== "0" : true
-        }
-    })
-], CliProxyAgent);
-export { CliProxyAgent };
+}
+injectable(CliProxyAgent).configuration({
+    proxy: {
+        url: process.env.HTTPS_PROXY || process.env.HTTP_PROXY,
+        strictSsl: process.env.NODE_TLS_REJECT_UNAUTHORIZED !== undefined ? process.env.NODE_TLS_REJECT_UNAUTHORIZED !== "0" : true
+    }
+});

package/lib/esm/services/CliService.js

@@ -1,10 +1,9 @@
-import { __decorate } from "tslib";
 import { classOf } from "@tsed/core";
-import { configuration, constant, destroyInjector, DIContext, getContext, inject, Injectable, injector, logger, Provider, runInContext } from "@tsed/di";
-import { $asyncEmit } from "@tsed/hooks";
+import { configuration, constant, destroyInjector, DIContext, getContext, inject, injectable, injector, logger, Provider, runInContext } from "@tsed/di";
+import { $asyncAlter, $asyncEmit } from "@tsed/hooks";
+import { pascalCase } from "change-case";
 import { Argument, Command } from "commander";
 import Inquirer from "inquirer";
-// @ts-ignore
 import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt";
 import { v4 } from "uuid";
 import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
@@ -17,7 +16,7 @@ import { parseOption } from "../utils/parseOption.js";
 import { CliHooks } from "./CliHooks.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
 Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt);
-let CliService = class CliService {
+export class CliService {
     constructor() {
         this.reinstallAfterRun = constant("project.reinstallAfterRun", false);
         this.program = new Command();
@@ -84,17 +83,17 @@ let CliService = class CliService {
     /**
      * Run prompt for a given command
      * @param cmdName
-     * @param ctx Initial data
+     * @param data Initial data
      */
-    async beforePrompt(cmdName, ctx = {}) {
+    async beforePrompt(cmdName, data = {}) {
         const provider = this.commands.get(cmdName);
         const instance = inject(provider.useClass);
-        const verbose = ctx.verbose;
+        const verbose = data.verbose;
         if (instance.$beforePrompt) {
-            ctx = await instance.$beforePrompt(JSON.parse(JSON.stringify(ctx)));
-            ctx.verbose = verbose;
+            data = await instance.$beforePrompt(JSON.parse(JSON.stringify(data)));
+            data.verbose = verbose;
         }
-        return ctx;
+        return data;
     }
     /**
      * Run prompt for a given command
@@ -131,7 +130,11 @@ let CliService = class CliService {
         if (instance.$beforeExec) {
             await instance.$beforeExec(data);
         }
-        return [...(await instance.$exec(data)), ...(await this.hooks.emit(CommandStoreKeys.EXEC_HOOKS, cmdName, data))];
+        return [
+            ...(await instance.$exec(data)),
+            ...(await this.hooks.emit(CommandStoreKeys.EXEC_HOOKS, cmdName, data)),
+            ...(await $asyncAlter(`$alter${pascalCase(cmdName)}Tasks`, [], [data]))
+        ];
     }
     async getPostInstallTasks(cmdName, data) {
         const provider = this.commands.get(cmdName);
@@ -140,6 +143,7 @@ let CliService = class CliService {
         return [
             ...(instance.$postInstall ? await instance.$postInstall(data) : []),
             ...(await this.hooks.emit(CommandStoreKeys.POST_INSTALL_HOOKS, cmdName, data)),
+            ...(await $asyncAlter(`$alter${pascalCase(cmdName)}PostInstallTasks`, [], [data])),
             ...(instance.$afterPostInstall ? await instance.$afterPostInstall(data) : [])
         ];
     }
@@ -193,6 +197,7 @@ let CliService = class CliService {
         const provider = this.commands.get(cmdName);
         const instance = inject(provider.useClass);
         const verbose = data.verbose;
+        data.commandName ||= cmdName;
         if (instance.$mapContext) {
             data = instance.$mapContext(JSON.parse(JSON.stringify(data)));
             data.verbose = verbose;
@@ -203,7 +208,7 @@ let CliService = class CliService {
         else {
             logger().level = "info";
         }
-        data.bindLogger = $ctx.get("command").bindLogger;
+        data.bindLogger = $ctx.get("command")?.bindLogger;
         $ctx.set("data", data);
         return data;
     }
@@ -255,8 +260,5 @@ let CliService = class CliService {
             return cmd.addArgument(argument);
         }, cmd);
     }
-};
-CliService = __decorate([
-    Injectable()
-], CliService);
-export { CliService };
+}
+injectable(CliService);

package/lib/esm/services/CliYaml.js

@@ -1,8 +1,7 @@
-import { __decorate } from "tslib";
-import { inject, Injectable } from "@tsed/di";
+import { inject, injectable } from "@tsed/di";
 import JsYaml from "js-yaml";
 import { CliFs } from "./CliFs.js";
-let CliYaml = class CliYaml {
+export class CliYaml {
     constructor() {
         this.fs = inject(CliFs);
     }
@@ -14,8 +13,5 @@ let CliYaml = class CliYaml {
         const content = JsYaml.dump(obj);
         return this.fs.writeFile(path, content, { encoding: "utf8" });
     }
-};
-CliYaml = __decorate([
-    Injectable()
-], CliYaml);
-export { CliYaml };
+}
+injectable(CliYaml);

package/lib/esm/services/NpmRegistryClient.js

@@ -1,7 +1,5 @@
-var NpmRegistryClient_1;
-import { __decorate } from "tslib";
 import url from "node:url";
-import { inject, Injectable } from "@tsed/di";
+import { inject, injectable } from "@tsed/di";
 import registry_auth_token from "registry-auth-token";
 import registry_url from "registry-url";
 import { CliHttpClient } from "./CliHttpClient.js";
@@ -14,7 +12,7 @@ export function addSuffix(pattern, suffix) {
     return pattern;
 }
 export const SCOPE_SEPARATOR = "%2f";
-let NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
+export class NpmRegistryClient {
     constructor() {
         this.httpClient = inject(CliHttpClient);
         this.host = registry_url();
@@ -44,7 +42,7 @@ let NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
                 await new Promise((resolve) => setTimeout(resolve, 200));
                 opts.retry -= 1;
                 opts.unfiltered = true;
-                return this.request(NpmRegistryClient_1.escapeName(pathname), opts);
+                return this.request(NpmRegistryClient.escapeName(pathname), opts);
             }
             throw error;
         }
@@ -118,8 +116,5 @@ let NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
             headers.Authorization = `${authInfo.type} ${authInfo.token}`;
         }
     }
-};
-NpmRegistryClient = NpmRegistryClient_1 = __decorate([
-    Injectable()
-], NpmRegistryClient);
-export { NpmRegistryClient };
+}
+injectable(NpmRegistryClient);

package/lib/esm/services/ProjectPackageJson.js

@@ -1,7 +1,6 @@
-import { __decorate, __metadata } from "tslib";
 import { dirname, join } from "node:path";
 import { getValue, setValue } from "@tsed/core";
-import { configuration, constant, inject, Injectable } from "@tsed/di";
+import { configuration, constant, inject, injectable } from "@tsed/di";
 import { readPackageUpSync } from "read-pkg-up";
 import { isValidVersion } from "../utils/isValidVersion.js";
 import { CliFs } from "./CliFs.js";
@@ -28,7 +27,7 @@ function mapPackages(deps) {
         return deps;
     }, { valid: {}, invalid: {} });
 }
-let ProjectPackageJson = class ProjectPackageJson {
+export class ProjectPackageJson {
     constructor() {
         this.rewrite = false;
         this.reinstall = false;
@@ -84,6 +83,15 @@ let ProjectPackageJson = class ProjectPackageJson {
     get preferences() {
         return this.raw[constant("name")];
     }
+    fillWithPreferences(ctx) {
+        return {
+            ...ctx,
+            packageManager: this.preferences.packageManager,
+            runtime: this.preferences.runtime,
+            architecture: this.preferences.architecture,
+            convention: this.preferences.convention
+        };
+    }
     $loadPackageJson() {
         return this.read();
     }
@@ -239,10 +247,10 @@ let ProjectPackageJson = class ProjectPackageJson {
     }
     getPackageJson() {
         const cwd = constant("project.rootDir");
-        const disableReadUpPkg = constant("command.metadata.disableReadUpPkg");
+        const disableReadUpPkg = constant("command.metadata.disableReadUpPkg", constant("disableReadUpPkg"));
         const name = constant("name");
         const pkgPath = join(String(cwd), "package.json");
-        const fileExists = this.fs.exists(pkgPath);
+        const fileExists = this.fs.fileExistsSync(pkgPath);
         if (fileExists) {
             const pkg = this.fs.readJsonSync(pkgPath, { encoding: "utf8" });
             configuration().set("project.root", pkgPath);
@@ -271,9 +279,5 @@ let ProjectPackageJson = class ProjectPackageJson {
             devDependencies: {}
         };
     }
-};
-ProjectPackageJson = __decorate([
-    Injectable({}),
-    __metadata("design:paramtypes", [])
-], ProjectPackageJson);
-export { ProjectPackageJson };
+}
+injectable(ProjectPackageJson);

package/lib/esm/utils/createInjector.js

@@ -1,6 +1,6 @@
 import "@tsed/logger-std";
 import "@tsed/logger-pattern-layout";
-import { injector, InjectorService } from "@tsed/di";
+import { inject, injector, InjectorService } from "@tsed/di";
 import { Logger } from "@tsed/logger";
 import { CliConfiguration } from "../services/CliConfiguration.js";
 import { ProjectPackageJson } from "../services/ProjectPackageJson.js";
@@ -10,7 +10,7 @@ export function getLogger() {
 }
 function createConfiguration(injector) {
     injector.addProvider(CliConfiguration);
-    return injector.invoke(CliConfiguration);
+    return inject(CliConfiguration);
 }
 export function createInjector(settings = {}) {
     const inj = injector();

package/lib/types/fn/command.d.ts

@@ -0,0 +1,3 @@
+import { injectable, type TokenProvider } from "@tsed/di";
+import type { CommandParameters } from "../interfaces/CommandParameters.js";
+export declare function command(token: TokenProvider, options: CommandParameters): ReturnType<typeof injectable>;

package/lib/types/index.d.ts

@@ -2,6 +2,7 @@ import "./utils/patchCommander.js";
 import Inquirer from "inquirer";
 export * from "./CliCore.js";
 export * from "./decorators/index.js";
+export * from "./fn/command.js";
 export * from "./interfaces/index.js";
 export * from "./packageManagers/index.js";
 export * from "./services/index.js";

package/lib/types/interfaces/CommandData.d.ts

@@ -0,0 +1,12 @@
+declare global {
+    namespace TsED {
+        interface InitialCommandData {
+        }
+    }
+}
+export interface CommandData extends TsED.InitialCommandData {
+    commandName?: string;
+    verbose?: boolean;
+    bindLogger?: boolean;
+    rawArgs?: string[];
+}

package/lib/types/interfaces/CommandMetadata.d.ts

@@ -12,7 +12,7 @@ export interface CommandMetadata extends CommandParameters {
     options: {
         [key: string]: CommandOptions;
     };
-    allowUnknownOption: boolean;
+    allowUnknownOption?: boolean;
     enableFeatures: string[];
     disableReadUpPkg: boolean;
     bindLogger: boolean;

package/lib/types/interfaces/CommandProvider.d.ts

@@ -1,5 +1,12 @@
+import "inquirer-autocomplete-prompt";
 import type { Answers, QuestionCollection } from "inquirer";
+import AutocompletePrompt from "inquirer-autocomplete-prompt";
 import type { Tasks } from "./Tasks.js";
+declare module "inquirer" {
+    interface QuestionMap<T extends Answers = Answers> {
+        autocomplete: AutocompletePrompt.AutocompleteQuestionOptions<T>;
+    }
+}
 export type QuestionOptions<T extends Answers = Answers> = QuestionCollection<T>;
 export interface CommandProvider<Ctx = any> {
     /**

package/lib/types/interfaces/index.d.ts

@@ -2,6 +2,7 @@ import { Type } from "@tsed/core";
 import type { CommandProvider } from "./CommandProvider.js";
 import type { PackageJson } from "./PackageJson.js";
 export * from "./CliDefaultOptions.js";
+export * from "./CommandData.js";
 export * from "./CommandMetadata.js";
 export * from "./CommandParameters.js";
 export * from "./CommandProvider.js";

package/lib/types/services/CliDockerComposeYaml.d.ts

@@ -1,11 +1,12 @@
 import { CliFs } from "./CliFs.js";
 import { CliYaml } from "./CliYaml.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
+export type CliDatabases = "mysql" | "mariadb" | "sqlite" | "better-sqlite3" | "postgres" | "cockroachdb" | "mssql" | "oracle" | "mongodb";
 export declare class CliDockerComposeYaml {
     protected cliYaml: CliYaml;
     protected fs: CliFs;
     protected projectPackageJson: ProjectPackageJson;
     read(): Promise<unknown>;
     write(obj: any): Promise<void>;
-    addDatabaseService(name: string, database: string): Promise<void>;
+    addDatabaseService(name: string, database: CliDatabases | undefined): Promise<void>;
 }

package/lib/types/services/CliFs.d.ts

@@ -1,7 +1,12 @@
 import type { PathLike, WriteFileOptions } from "node:fs";
+import { RealFileSystemHost } from "@ts-morph/common";
 import Fs, { type EnsureDirOptions } from "fs-extra";
-export declare class CliFs {
+export declare class CliFs extends RealFileSystemHost {
     raw: typeof Fs;
+    /**
+     * @deprecated
+     * @param path
+     */
     exists(path: string): boolean;
     join(...args: string[]): string;
     readFile(file: string | Buffer | number, encoding?: any): Promise<string>;
@@ -9,6 +14,7 @@ export declare class CliFs {
     readJson(file: string, encoding?: any): Promise<any>;
     readJsonSync(file: string, encoding?: any): any;
     writeJson(file: string | Buffer | number, data: any, options?: WriteFileOptions | string): Promise<any>;
+    writeJsonSync(file: string | Buffer | number, data: any, options?: WriteFileOptions | string): void;
     writeFileSync(path: PathLike | number, data: any, options?: WriteFileOptions): void;
     writeFile(file: string | Buffer | number, data: any, options?: WriteFileOptions | string): Promise<void>;
     ensureDir(path: string, options?: EnsureDirOptions | number): Promise<void>;

package/lib/types/services/CliProxyAgent.d.ts

@@ -1,4 +1,5 @@
 import { CliExeca } from "./CliExeca.js";
+import { ProjectPackageJson } from "./ProjectPackageJson.js";
 export interface CliProxySettings {
     url: string;
     strictSsl: boolean;
@@ -7,7 +8,7 @@ export declare class CliProxyAgent {
     readonly proxySettings: {
         value: CliProxySettings;
     };
-    protected projectPackageJson: any;
+    protected projectPackageJson: ProjectPackageJson;
     protected cliExeca: CliExeca;
     protected tunnel: typeof import("tunnel");
     $onInit(): Promise<void>;

package/lib/types/services/CliService.d.ts

@@ -1,6 +1,8 @@
 import { DIContext } from "@tsed/di";
 import { Command } from "commander";
+import type { CommandData } from "../interfaces/CommandData.js";
 import type { CommandMetadata } from "../interfaces/CommandMetadata.js";
+import type { Task } from "../interfaces/index.js";
 import { PackageManagersModule } from "../packageManagers/index.js";
 import { CliHooks } from "./CliHooks.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
@@ -23,27 +25,27 @@ export declare class CliService {
      * @param data
      * @param $ctx
      */
-    runLifecycle(cmdName: string, data: any, $ctx: DIContext): Promise<Promise<void>>;
-    dispatch(cmdName: string, data: any, $ctx: DIContext): Promise<void>;
+    runLifecycle(cmdName: string, data: CommandData | undefined, $ctx: DIContext): Promise<Promise<void>>;
+    dispatch(cmdName: string, data: CommandData, $ctx: DIContext): Promise<void>;
     exec(cmdName: string, data: any, $ctx: DIContext): Promise<any>;
     /**
      * Run prompt for a given command
      * @param cmdName
-     * @param ctx Initial data
+     * @param data Initial data
      */
-    beforePrompt(cmdName: string, ctx?: any): Promise<any>;
+    beforePrompt(cmdName: string, data?: CommandData): Promise<CommandData>;
     /**
      * Run prompt for a given command
      * @param cmdName
      * @param ctx Initial data
      */
-    prompt(cmdName: string, ctx?: any): Promise<any>;
+    prompt(cmdName: string, ctx?: CommandData): Promise<CommandData>;
     /**
      * Run lifecycle
      * @param cmdName
      * @param data
      */
-    getTasks(cmdName: string, data: any): Promise<any[]>;
+    getTasks(cmdName: string, data: any): Promise<Task[]>;
     getPostInstallTasks(cmdName: string, data: any): Promise<any[]>;
     createCommand(metadata: CommandMetadata): any;
     private load;

package/lib/types/services/ProjectPackageJson.d.ts

@@ -28,6 +28,12 @@ export declare class ProjectPackageJson {
         [key: string]: string;
     };
     get preferences(): ProjectPreferences;
+    fillWithPreferences<T extends {}>(ctx: T): T & {
+        packageManager: import("../interfaces/ProjectPreferences.js").PackageManager;
+        runtime: any;
+        architecture: any;
+        convention: any;
+    };
     $loadPackageJson(): this;
     toJSON(): PackageJson;
     read(): this;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "6.6.2",
+  "version": "7.0.0-alpha.1",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -32,9 +32,9 @@
     "listr"
   ],
   "dependencies": {
-    "@tsed/logger": ">=8.0.0",
-    "@tsed/logger-pattern-layout": ">=8.0.0",
-    "@tsed/logger-std": ">=8.0.0",
+    "@tsed/logger": ">=8.0.3",
+    "@tsed/logger-pattern-layout": ">=8.0.3",
+    "@tsed/logger-std": ">=8.0.3",
     "@tsed/normalize-path": ">=8.0.0",
     "@types/inquirer": "^9.0.7",
     "ajv": "^8.17.1",
@@ -64,7 +64,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "6.6.2",
+    "@tsed/typescript": "7.0.0-alpha.1",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",
@@ -102,5 +102,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-core",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "alpha"
+  }
 }

package/readme.md

@@ -39,10 +39,10 @@ npm install @tsed/core @tsed/di @tsed/cli-core
 
 ## Getting started
 
-Create CLI require some steps like create a package.json with the right information and create a structure directory
+Create CLI requires some steps like create a package.json with the right information and create a structure directory
 aligned with TypeScript to be compiled correctly for a npm deployment.
 
-Here a structure directory example:
+Here is a structure directory example:
 
 ```
 .
@@ -57,93 +57,6 @@ Here a structure directory example:
 └── tsconfig.compile.json
 ```
 
-## Create package.json and tsconfig
-
-The first step is to create the package.json with the following lines:
-
-```jsonc
-{
-  "name": "{{name}}",
-  "version": "1.0.0",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
-  "bin": {
-    "tsed": "lib/bin/{{name}}.js"
-  },
-  "files": ["lib/bin/{{name}}.js", "lib/bin", "lib", "templates"],
-  "description": "An awesome CLI build on top of @tsed/cli-core",
-  "dependencies": {
-    "@tsed/cli-core": "1.3.1",
-    "tslib": "1.11.1"
-  },
-  "devDependencies": {
-    "@tsed/cli-testing": "1.3.1",
-    "ts-node": "latest",
-    "typescript": "latest"
-  },
-  "scripts": {
-    "build": "tsc --build tsconfig.compile.json",
-    "start:cmd:add": "cross-env NODE_ENV=development ts-node -r src/bin/{{name}}.ts add -r ./.tmp"
-  },
-  "engines": {
-    "node": ">=8.9"
-  },
-  "peerDependencies": {}
-}
-```
-
-Then create tsconfig files one for the IDE (`tsconfig.json`):
-
-```json
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2016",
-    "sourceMap": true,
-    "declaration": false,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "moduleResolution": "node",
-    "isolatedModules": false,
-    "suppressImplicitAnyIndexErrors": false,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "allowSyntheticDefaultImports": true,
-    "importHelpers": true,
-    "newLine": "LF",
-    "noEmit": true,
-    "lib": ["es7", "dom", "esnext.asynciterable"],
-    "typeRoots": ["./node_modules/@types"]
-  },
-  "linterOptions": {
-    "exclude": []
-  },
-  "exclude": []
-}
-```
-
-And another one to compile source (`tsconfig.compile.json`):
-
-```json
-{
-  "extends": "./tsconfig.compile.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib",
-    "moduleResolution": "node",
-    "declaration": true,
-    "noResolve": false,
-    "preserveConstEnums": true,
-    "sourceMap": true,
-    "noEmit": false,
-    "inlineSources": true
-  },
-  "exclude": ["node_modules", "test", "lib", "**/*.spec.ts"]
-}
-```
-
 ## Create the bin file
 
 The bin file is used by npm to create your node.js executable program when you install the node_module globally.
@@ -155,19 +68,13 @@ Create a new file according to your project name (example: `name.ts`) and add th
 import {AddCmd, CliCore} from "@tsed/cli-core";
 import {resolve} from "node:path";
 
-const pkg = require("../../package.json");
-const TEMPLATE_DIR = resolve(__dirname, "..", "..", "templates");
-
 CliCore.bootstrap({
   commands: [
     AddCmd // CommandProvider to install a plugin
     // then add you commands
   ],
-
   // optionals
-  name: "name", // replace by the cli name. This property will be used by Plugins command
-  pkg,
-  templateDir: TEMPLATE_DIR
+  name: "name" // replace by the cli name. This property will be used by Plugins command
 }).catch(console.error);
 ```
 
@@ -265,12 +172,6 @@ export class GenerateCmd implements CommandProvider {
 }
 ```
 
-Finally, create a handlebars template in templates directory:
-
-```hbs
-import {Injectable} from "@tsed/di"; @Injectable() export class {{symbolName}} { }
-```
-
 ## Run command in dev mode
 
 In your package.json add the following line in scripts property:
@@ -281,13 +182,13 @@ In your package.json add the following line in scripts property:
 }
 ```
 
-> Note: replace {{name}} by the name of you bin file located in src/bin.
+> Note: replace {{name}} by the name of your bin file located in src/bin.
 
 > Note 2: The option `-r ./.tmp` create a temporary directory to generate files with your command.
 
 ## More examples
 
-Here other commands examples:
+Here are other command examples:
 
 - Init a project command: https://github.com/tsedio/tsed-cli/tree/master/packages/cli/src/commands/init/InitCmd
 - Generate command: https://github.com/tsedio/tsed-cli/tree/master/packages/cli/src/commands/generate/GenerateCmd