@tsed/cli-core 3.20.10 → 3.20.13

package/lib/index.js

@@ -176,14 +176,13 @@ exports.CliExeca = class CliExeca {
   constructor() {
     this.raw = execa__default['default'];
   }
+
   /**
    *
    * @param cmd
    * @param args
    * @param opts
    */
-
-
   run(cmd, args, opts) {
     const cp = this.raw(cmd, args, opts);
     const stdout = streamToObservable(cp.stdout.pipe(split()), {
@@ -370,9 +369,14 @@ function defaultPreferences(pkg) {
 
 exports.ProjectPackageJson = class ProjectPackageJson {
   constructor(configuration) {
-    this.configuration = configuration;
+    this.configuration = void 0;
     this.rewrite = false;
     this.reinstall = false;
+    this.cliExeca = void 0;
+    this.fs = void 0;
+    this.GH_TOKEN = void 0;
+    this.raw = void 0;
+    this.configuration = configuration;
     this.setRaw({
       name: "",
       version: "1.0.0",
@@ -974,6 +978,10 @@ function parseOption(value, options) {
 }
 
 let CliHooks = class CliHooks {
+  constructor() {
+    this.injector = void 0;
+  }
+
   async emit(hookName, cmd, ...args) {
     const providers = this.injector.getProviders();
     let results = [];
@@ -1009,6 +1017,10 @@ exports.CliService = class CliService {
   constructor() {
     this.program = new commander.Command();
     this.reinstallAfterRun = false;
+    this.pkg = void 0;
+    this.injector = void 0;
+    this.hooks = void 0;
+    this.projectPkg = void 0;
     this.commands = new Map();
   }
 
@@ -1333,6 +1345,11 @@ function cast(value) {
 }
 
 let CliProxyAgent = class CliProxyAgent {
+  constructor() {
+    this.proxySettings = void 0;
+    this.cliExeca = void 0;
+  }
+
   hasProxy() {
     return !!this.proxySettings.url;
   }
@@ -1418,6 +1435,8 @@ function logToCurl({
 
 let CliHttpLogClient = class CliHttpLogClient {
   constructor(options = {}) {
+    this.callee = void 0;
+    this.logger = void 0;
     this.callee = options.callee || "http";
   }
 
@@ -1499,6 +1518,12 @@ CliHttpLogClient = tslib.__decorate([tslib.__param(0, di.Opts), tslib.__metadata
 
 var CliHttpClient_1;
 exports.CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClient {
+  constructor(...args) {
+    super(...args);
+    this.cliProxyAgent = void 0;
+    this.host = void 0;
+  }
+
   static getParamsSerializer(params) {
     return querystring__default['default'].stringify(core.cleanObject(params));
   }
@@ -1614,41 +1639,43 @@ exports.CliHttpClient = CliHttpClient_1 = tslib.__decorate([di.Injectable()], ex
 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(exports.ProjectPackageJson);
   const fs = injector.invoke(exports.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 = di.GlobalProviders.get(plugin)) == null ? void 0 : _GlobalProviders$get.clone();
+        const provider = (_GlobalProviders$get = di.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 = di.GlobalProviders.get(token)) == null ? void 0 : _GlobalProviders$get2.clone());
+            injector.add(token, (_GlobalProviders$get2 = di.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__default['default'].green(listr2.figures.tick), mod, "module loaded");
+    } catch (er) {
+      injector.logger.warn(chalk__default['default'].red(listr2.figures.cross), "Fail to load plugin", mod);
     }
   });
   await all(promises);
@@ -1669,6 +1696,10 @@ function addSuffix(pattern, suffix) {
 }
 const SCOPE_SEPARATOR = "%2f";
 exports.NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
+  constructor() {
+    this.httpClient = void 0;
+  }
+
   static escapeName(name) {
     // scoped packages contain slashes and the npm registry expects them to be escaped
     return name.replace("/", SCOPE_SEPARATOR);
@@ -1794,6 +1825,14 @@ function mapPlugins(_ref) {
 }
 
 exports.CliPlugins = class CliPlugins {
+  constructor() {
+    this.name = void 0;
+    this.npmRegistryClient = void 0;
+    this.injector = void 0;
+    this.cliHooks = void 0;
+    this.packageJson = void 0;
+  }
+
   async searchPlugins(keyword = "", options = {}) {
     const result = await this.npmRegistryClient.search(this.getKeyword(keyword), options);
     return result.filter(({
@@ -1852,6 +1891,10 @@ exports.CliPlugins = tslib.__decorate([di.Injectable()], exports.CliPlugins);
 const runScript = require("@npmcli/run-script");
 
 exports.CliRunScript = class CliRunScript {
+  constructor() {
+    this.projectPackageJson = void 0;
+  }
+
   run(cmd, args, options = {}) {
     return runScript(_extends({
       event: "run"
@@ -3357,6 +3400,12 @@ const _excluded = ["path"];
 const normalizePath = require("normalize-path");
 
 class Renderer {
+  constructor() {
+    this.configuration = void 0;
+    this.templateDir = void 0;
+    this.fs = void 0;
+  }
+
   async render(path$1, data, options = {}) {
     const {
       output,
@@ -3495,6 +3544,8 @@ class Renderer {
 
 }
 
+tslib.__decorate([di.Configuration(), tslib.__metadata("design:type", Object)], Renderer.prototype, "configuration", void 0);
+
 tslib.__decorate([di.Constant("templateDir"), tslib.__metadata("design:type", String)], Renderer.prototype, "templateDir", void 0);
 
 tslib.__decorate([di.Inject(), tslib.__metadata("design:type", exports.CliFs)], Renderer.prototype, "fs", void 0);
@@ -3507,11 +3558,6 @@ exports.RootRendererService = class RootRendererService extends Renderer {
   }
 
 };
-
-tslib.__decorate([di.Constant("templateDir"), tslib.__metadata("design:type", String)], exports.RootRendererService.prototype, "templateDir", void 0);
-
-tslib.__decorate([di.Configuration(), tslib.__metadata("design:type", Object)], exports.RootRendererService.prototype, "configuration", void 0);
-
 exports.RootRendererService = tslib.__decorate([di.Injectable()], exports.RootRendererService);
 exports.SrcRendererService = class SrcRendererService extends Renderer {
   get rootDir() {
@@ -3521,11 +3567,6 @@ exports.SrcRendererService = class SrcRendererService extends Renderer {
   }
 
 };
-
-tslib.__decorate([di.Constant("templateDir"), tslib.__metadata("design:type", String)], exports.SrcRendererService.prototype, "templateDir", void 0);
-
-tslib.__decorate([di.Configuration(), tslib.__metadata("design:type", Object)], exports.SrcRendererService.prototype, "configuration", void 0);
-
 exports.SrcRendererService = tslib.__decorate([di.Injectable()], exports.SrcRendererService);
 exports.ScriptsRendererService = class ScriptsRendererService extends Renderer {
   get rootDir() {
@@ -3535,14 +3576,14 @@ exports.ScriptsRendererService = class ScriptsRendererService extends Renderer {
   }
 
 };
-
-tslib.__decorate([di.Constant("templateDir"), tslib.__metadata("design:type", String)], exports.ScriptsRendererService.prototype, "templateDir", void 0);
-
-tslib.__decorate([di.Configuration(), tslib.__metadata("design:type", Object)], exports.ScriptsRendererService.prototype, "configuration", void 0);
-
 exports.ScriptsRendererService = tslib.__decorate([di.Injectable()], exports.ScriptsRendererService);
 
 exports.CliYaml = class CliYaml {
+  constructor() {
+    this.projectPackageJson = void 0;
+    this.fs = void 0;
+  }
+
   async read(path) {
     const file = !this.fs.exists(path) ? this.fs.findUpFile(this.projectPackageJson.dir, path) : path;
 
@@ -3573,6 +3614,10 @@ tslib.__decorate([di.Inject(), tslib.__metadata("design:type", exports.CliFs)],
 exports.CliYaml = tslib.__decorate([di.Injectable()], exports.CliYaml);
 
 exports.CliDockerComposeYaml = class CliDockerComposeYaml {
+  constructor() {
+    this.cliYaml = void 0;
+  }
+
   async read() {
     return this.cliYaml.read("docker-compose.yml");
   }
@@ -3660,6 +3705,8 @@ class CliError extends Error {
   }) {
     super(origin.message);
     this.name = "CLI_ERROR";
+    this.cli = void 0;
+    this.origin = void 0;
     this.cli = cli;
     this.origin = origin;
     this.stack = origin.stack;
@@ -3676,6 +3723,11 @@ function isHelpManual(argv) {
 }
 
 exports.CliCore = CliCore_1 = class CliCore {
+  constructor() {
+    this.injector = void 0;
+    this.cliService = void 0;
+  }
+
   static checkNodeVersion(wanted, id) {
     if (!semver.satisfies(process.version, wanted)) {
       console.log(chalk__default['default'].red("You are using Node " + process.version + ", but this version of " + id + " requires Node " + wanted + ".\nPlease upgrade your Node version."));
@@ -3693,7 +3745,7 @@ exports.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,
@@ -3709,7 +3761,7 @@ exports.CliCore = CliCore_1 = class CliCore {
     const container = di.createContainer();
     await injector.load(container, module);
     await injector.emit("$afterInit");
-    injector.settings.loaded = true;
+    injector.settings.set("loaded", true);
   }
 
   static updateNotifier(pkg) {