@tsed/cli-core 3.14.1 → 3.17.0

package/lib/index.js

@@ -731,24 +731,15 @@ function getLogger() {
 }
 
 function createConfiguration(injector) {
-  const provider = di.GlobalProviders.get(exports.CliConfiguration).clone();
-  provider.instance = injector.invoke(provider.useClass);
-  injector.addProvider(exports.CliConfiguration, provider);
-  return provider.instance;
-}
-
-function createProjectPackageJson(injector) {
-  const provider = di.GlobalProviders.get(exports.ProjectPackageJson).clone();
-  injector.addProvider(exports.ProjectPackageJson, provider);
-  provider.instance = injector.invoke(provider);
-  return provider.instance;
+  injector.addProvider(exports.CliConfiguration);
+  return injector.invoke(exports.CliConfiguration);
 }
 
 function createInjector(settings = {}) {
   const injector = new di.InjectorService();
   injector.settings = createConfiguration(injector);
   logger = injector.logger = new logger$1.Logger(settings.name || "CLI");
-  createProjectPackageJson(injector);
+  injector.addProvider(exports.ProjectPackageJson);
   injector.settings.set(settings);
   /* istanbul ignore next */
 
@@ -1044,6 +1035,7 @@ exports.CliService = class CliService {
 
 
   async runLifecycle(cmdName, data = {}) {
+    data = await this.beforePrompt(cmdName, data);
     data = await this.prompt(cmdName, data);
 
     try {
@@ -1079,6 +1071,25 @@ exports.CliService = class CliService {
    */
 
 
+  async beforePrompt(cmdName, ctx = {}) {
+    const provider = this.commands.get(cmdName);
+    const instance = this.injector.get(provider.useClass);
+    const verbose = ctx.verbose;
+
+    if (instance.$beforePrompt) {
+      ctx = await instance.$beforePrompt(JSON.parse(JSON.stringify(ctx)));
+      ctx.verbose = verbose;
+    }
+
+    return ctx;
+  }
+  /**
+   * Run prompt for a given command
+   * @param cmdName
+   * @param ctx Initial data
+   */
+
+
   async prompt(cmdName, ctx = {}) {
     const provider = this.commands.get(cmdName);
     const instance = this.injector.get(provider.useClass);
@@ -1593,7 +1604,7 @@ async function loadPlugins(injector) {
   } = injector.settings;
   const projectPackageJson = injector.invoke(exports.ProjectPackageJson);
   const fs = injector.invoke(exports.CliFs);
-  const promises = Object.keys(projectPackageJson.allDependencies).filter(mod => mod.startsWith(`@${name}/cli-plugin`) || mod.startsWith(`${name}-cli-plugin`)).map(async mod => {
+  const promises = Object.keys(projectPackageJson.allDependencies).filter(mod => mod.startsWith(`@${name}/cli-plugin`) || mod.includes(`${name}-cli-plugin`)).map(async mod => {
     const {
       default: plugin
     } = await fs.importModule(mod, rootDir);
@@ -1803,7 +1814,7 @@ exports.CliPlugins = class CliPlugins {
   }
 
   isPlugin(name) {
-    return name.startsWith(`@${this.name}/cli-plugin`) || name.startsWith(`${this.name}-cli-plugin`);
+    return name.startsWith(`@${this.name}/cli-plugin`) || name.includes(`${this.name}-cli-plugin`);
   }
 
 };