@tsed/cli-core 3.20.9 → 3.20.12

package/lib/index.modern.js

@@ -8,7 +8,7 @@ import { GlobalProviders, Provider, Injectable, DIConfiguration, Inject, Configu
 export { Configuration, Constant, Container, DITest, Inject, Injectable, InjectorService, LocalsContainer, Module, Opts, OverrideProvider, UseOpts, Value, registerProvider } from '@tsed/di';
 import { __decorate, __metadata, __param } from 'tslib';
 import { Command as Command$1, Argument } from 'commander';
-import { Listr, Logger as Logger$1 } from 'listr2';
+import { Listr, Logger as Logger$1, figures } from 'listr2';
 import { join, dirname, relative, resolve } from 'path';
 import { EMPTY, throwError, Observable } from 'rxjs';
 import { merge, filter, catchError } from 'rxjs/operators';
@@ -1579,41 +1579,43 @@ CliHttpClient = CliHttpClient_1 = __decorate([Injectable()], CliHttpClient);
 const all = promises => Promise.all(promises);
 
 async function loadPlugins(injector) {
-  const {
-    name,
-    project: {
-      rootDir
-    }
-  } = injector.settings;
+  const name = injector.settings.get("name");
+  const rootDir = injector.settings.get("project.rootDir");
   const projectPackageJson = injector.invoke(ProjectPackageJson);
   const fs = injector.invoke(CliFs);
   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);
+    try {
+      const {
+        default: plugin
+      } = await fs.importModule(mod, rootDir);
 
-    if (!injector.has(plugin)) {
-      var _GlobalProviders$get;
+      if (!injector.has(plugin)) {
+        var _GlobalProviders$get;
 
-      const provider = (_GlobalProviders$get = GlobalProviders.get(plugin)) == null ? void 0 : _GlobalProviders$get.clone();
+        const provider = (_GlobalProviders$get = GlobalProviders.get(plugin)) == null ? void 0 : _GlobalProviders$get.clone();
 
-      if (provider != null && provider.imports.length) {
-        await all(provider.imports.map(async token => {
-          var _GlobalProviders$get2;
+        if (provider != null && provider.imports.length) {
+          await all(provider.imports.map(async token => {
+            var _GlobalProviders$get2;
 
-          injector.add(token, (_GlobalProviders$get2 = GlobalProviders.get(token)) == null ? void 0 : _GlobalProviders$get2.clone());
+            injector.add(token, (_GlobalProviders$get2 = GlobalProviders.get(token)) == null ? void 0 : _GlobalProviders$get2.clone());
 
-          if (injector.settings.loaded) {
-            await injector.invoke(token);
-          }
-        }));
-      }
+            if (injector.settings.get("loaded")) {
+              await injector.invoke(token);
+            }
+          }));
+        }
 
-      injector.add(plugin, provider);
+        injector.add(plugin, provider);
 
-      if (injector.settings.loaded) {
-        await injector.invoke(plugin);
+        if (injector.settings.get("loaded")) {
+          await injector.invoke(plugin);
+        }
       }
+
+      injector.logger.info(chalk.green(figures.tick), mod, "module loaded");
+    } catch (er) {
+      injector.logger.warn(chalk.red(figures.cross), "Fail to load plugin", mod);
     }
   });
   await all(promises);
@@ -3660,7 +3662,7 @@ let CliCore = CliCore_1 = class CliCore {
     const cli = injector.get(CliCore_1);
 
     try {
-      await cli.cliService.parseArgs(injector.settings.argv);
+      await cli.cliService.parseArgs(injector.settings.get("argv"));
     } catch (er) {
       throw new CliError({
         origin: er,
@@ -3676,7 +3678,7 @@ let CliCore = CliCore_1 = class CliCore {
     const container = createContainer();
     await injector.load(container, module);
     await injector.emit("$afterInit");
-    injector.settings.loaded = true;
+    injector.settings.set("loaded", true);
   }
 
   static updateNotifier(pkg) {