@tsed/cli-core 3.20.16 → 3.20.17

package/lib/index.js

@@ -10,6 +10,8 @@ var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
 var semver$1 = require('semver');
 var execa = require('execa');
+require('any-observable/register/rxjs-all');
+var streamToObservable = require('@samverschueren/stream-to-observable');
 var Fs = require('fs-extra');
 var readPkgUp = require('read-pkg-up');
 var axios = require('axios');
@@ -19,7 +21,10 @@ var changeCase = require('change-case');
 var parse = require('url-parse');
 var chalk = require('chalk');
 var url = require('url');
+var registry_url = require('registry-url');
+var runScript = require('@npmcli/run-script');
 var Consolidate = require('consolidate');
+var normalizePath$1 = require('normalize-path');
 var globby = require('globby');
 var handlebars = require('handlebars');
 var JsYaml = require('js-yaml');
@@ -36,20 +41,19 @@ function _interopNamespace(e) {
         var d = Object.getOwnPropertyDescriptor(e, k);
         Object.defineProperty(n, k, d.get ? d : {
           enumerable: true,
-          get: function () {
-            return e[k];
-          }
+          get: function () { return e[k]; }
         });
       }
     });
   }
-  n['default'] = e;
+  n["default"] = e;
   return n;
 }
 
 var Inquirer__default = /*#__PURE__*/_interopDefaultLegacy(Inquirer);
 var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver$1);
 var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
+var streamToObservable__default = /*#__PURE__*/_interopDefaultLegacy(streamToObservable);
 var Fs__default = /*#__PURE__*/_interopDefaultLegacy(Fs);
 var readPkgUp__default = /*#__PURE__*/_interopDefaultLegacy(readPkgUp);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
@@ -58,7 +62,10 @@ var tunnel__default = /*#__PURE__*/_interopDefaultLegacy(tunnel);
 var parse__default = /*#__PURE__*/_interopDefaultLegacy(parse);
 var chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
 var url__default = /*#__PURE__*/_interopDefaultLegacy(url);
+var registry_url__default = /*#__PURE__*/_interopDefaultLegacy(registry_url);
+var runScript__default = /*#__PURE__*/_interopDefaultLegacy(runScript);
 var Consolidate__default = /*#__PURE__*/_interopDefaultLegacy(Consolidate);
+var normalizePath__default = /*#__PURE__*/_interopDefaultLegacy(normalizePath$1);
 var globby__default = /*#__PURE__*/_interopDefaultLegacy(globby);
 var handlebars__default = /*#__PURE__*/_interopDefaultLegacy(handlebars);
 var JsYaml__default = /*#__PURE__*/_interopDefaultLegacy(JsYaml);
@@ -166,15 +173,11 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-require("any-observable/register/rxjs-all");
-
-const streamToObservable = require("@samverschueren/stream-to-observable");
-
 const split = require("split");
 
 exports.CliExeca = class CliExeca {
   constructor() {
-    this.raw = execa__default['default'];
+    this.raw = execa__default["default"];
   }
 
   /**
@@ -185,10 +188,10 @@ exports.CliExeca = class CliExeca {
    */
   run(cmd, args, opts) {
     const cp = this.raw(cmd, args, opts);
-    const stdout = streamToObservable(cp.stdout.pipe(split()), {
+    const stdout = streamToObservable__default["default"](cp.stdout.pipe(split()), {
       await: cp
     });
-    const stderr = streamToObservable(cp.stderr.pipe(split()), {
+    const stderr = streamToObservable__default["default"](cp.stderr.pipe(split()), {
       await: cp
     });
     return stdout.pipe(operators.merge(stderr)).pipe(operators.filter(Boolean));
@@ -211,14 +214,14 @@ exports.CliExeca = tslib.__decorate([di.Injectable()], exports.CliExeca);
 
 const fixPath = require("normalize-path");
 
-function normalizePath$1(item, ...paths) {
+function normalizePath(item, ...paths) {
   if (core.isString(item)) {
     const path$1 = path.join(item, ...paths);
     return fixPath(path$1);
   }
 
   if (core.isArray(item)) {
-    return item.map(item => normalizePath$1(item));
+    return item.map(item => normalizePath(item));
   }
 
   return item;
@@ -226,7 +229,7 @@ function normalizePath$1(item, ...paths) {
 
 exports.CliFs = class CliFs {
   constructor() {
-    this.raw = Fs__default['default'];
+    this.raw = Fs__default["default"];
   }
 
   exists(path) {
@@ -234,7 +237,7 @@ exports.CliFs = class CliFs {
   }
 
   join(...args) {
-    return normalizePath$1(path.join(...args));
+    return normalizePath(path.join(...args));
   }
 
   async readFile(file, encoding) {
@@ -264,17 +267,17 @@ exports.CliFs = class CliFs {
   async importModule(mod, root = process.cwd()) {
     try {
       if (process.env.NODE_ENV === "development") {
-        return await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(mod)); });
+        return await (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(mod);
       }
     } catch (er) {}
 
     const path$1 = this.findUpFile(root, path.join("node_modules", mod));
 
     if (path$1) {
-      return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(path$1)); });
+      return (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path$1);
     }
 
-    return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(mod)); });
+    return (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(mod);
   }
 
 };
@@ -282,13 +285,13 @@ exports.CliFs = tslib.__decorate([di.Injectable()], exports.CliFs);
 
 function isValidVersion(version) {
   version = version.replace(/[~>=<]/gi, "");
-  return !!semver__default['default'].valid(version);
+  return !!semver__default["default"].valid(version);
 }
 
 function useReadPkgUp(configuration) {
   var _configuration$projec;
 
-  return !(process.argv.includes("init") && !Fs__default['default'].existsSync(path.join(String((_configuration$projec = configuration.project) == null ? void 0 : _configuration$projec.rootDir), "package.json")));
+  return !(process.argv.includes("init") && !Fs__default["default"].existsSync(path.join(String((_configuration$projec = configuration.project) == null ? void 0 : _configuration$projec.rootDir), "package.json")));
 }
 
 function getEmptyPackageJson(configuration) {
@@ -306,14 +309,14 @@ function getPackageJson(configuration) {
   if (useReadPkgUp(configuration)) {
     var _configuration$projec2;
 
-    const result = readPkgUp__default['default'].sync({
+    const result = readPkgUp__default["default"].sync({
       cwd: (_configuration$projec2 = configuration.project) == null ? void 0 : _configuration$projec2.rootDir
     });
 
     if (result && result.path) {
       const pkgPath = path.dirname(result.path);
       configuration.set("project.root", pkgPath);
-      const pkg = Fs__default['default'].readJsonSync(result.path, {
+      const pkg = Fs__default["default"].readJsonSync(result.path, {
         encoding: "utf8"
       });
       return _extends({}, getEmptyPackageJson(configuration), pkg);
@@ -328,7 +331,7 @@ function mapPackagesWithInvalidVersion(deps) {
     return info[1] === "latest" ? info[0] : info.join("@");
   };
 
-  return Object.entries(deps).filter(([, version]) => !semver__default['default'].valid(version)).map(toString);
+  return Object.entries(deps).filter(([, version]) => !semver__default["default"].valid(version)).map(toString);
 }
 
 function sortKeys(obj) {
@@ -1012,7 +1015,7 @@ tslib.__decorate([di.Inject(), tslib.__metadata("design:type", di.InjectorServic
 CliHooks = tslib.__decorate([di.Injectable()], CliHooks);
 
 const _excluded$2 = ["description", "required", "customParser", "defaultValue"];
-Inquirer__default['default'].registerPrompt("autocomplete", require("inquirer-autocomplete-prompt"));
+Inquirer__default["default"].registerPrompt("autocomplete", require("inquirer-autocomplete-prompt"));
 exports.CliService = class CliService {
   constructor() {
     this.program = new commander.Command();
@@ -1128,7 +1131,7 @@ exports.CliService = class CliService {
       const questions = [...(await instance.$prompt(ctx)), ...(await this.hooks.emit(CommandStoreKeys.PROMPT_HOOKS, cmdName, ctx))];
 
       if (questions.length) {
-        ctx = _extends({}, ctx, await Inquirer__default['default'].prompt(questions));
+        ctx = _extends({}, ctx, await Inquirer__default["default"].prompt(questions));
       }
     }
 
@@ -1371,8 +1374,8 @@ let CliProxyAgent = class CliProxyAgent {
       };
       const method = changeCase.camelCase([type, "over", protocol].join(" "));
 
-      if (tunnel__default['default'][method]) {
-        return tunnel__default['default'][method](options);
+      if (tunnel__default["default"][method]) {
+        return tunnel__default["default"][method](options);
       }
     }
 
@@ -1417,7 +1420,7 @@ function logToCurl({
   data,
   headers = {}
 }) {
-  const request = parse__default['default'](url, true);
+  const request = parse__default["default"](url, true);
 
   if (params) {
     request.set("query", Object.assign(params, query));
@@ -1452,7 +1455,7 @@ let CliHttpLogClient = class CliHttpLogClient {
       status: "KO",
       callee_code: origin.code,
       callee_error: origin.message,
-      callee_request_qs: options.params && querystring__default['default'].stringify(options.params),
+      callee_request_qs: options.params && querystring__default["default"].stringify(options.params),
       callee_request_headers: options.headers,
       callee_request_body: options.data && JSON.stringify(options.data),
       callee_response_headers: origin.headers,
@@ -1492,7 +1495,7 @@ let CliHttpLogClient = class CliHttpLogClient {
       callee,
       url,
       method,
-      callee_qs: options.params && querystring__default['default'].stringify(options.params),
+      callee_qs: options.params && querystring__default["default"].stringify(options.params),
       duration: isNaN(duration) ? undefined : duration
     };
   }
@@ -1535,7 +1538,7 @@ exports.CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLog
   async head(endpoint, options = {}) {
     const {
       headers
-    } = await axios__default['default'](this.getRequestParameters("HEAD", endpoint, options));
+    } = await axios__default["default"](this.getRequestParameters("HEAD", endpoint, options));
     return headers;
   }
 
@@ -1604,7 +1607,7 @@ exports.CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLog
     const startTime = new Date().getTime();
 
     try {
-      const response = await axios__default['default'](_extends({
+      const response = await axios__default["default"](_extends({
         paramsSerializer: CliHttpClient_1.getParamsSerializer
       }, options));
       this.onSuccess(_extends({
@@ -1673,18 +1676,16 @@ async function loadPlugins(injector) {
         }
       }
 
-      injector.logger.info(chalk__default['default'].green(listr2.figures.tick), mod, "module loaded");
+      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);
+      injector.logger.warn(chalk__default["default"].red(listr2.figures.cross), "Fail to load plugin", mod);
     }
   });
   await all(promises);
 }
 
 var NpmRegistryClient_1;
-
-const HOST = require("registry-url")();
-
+const HOST = registry_url__default["default"]();
 const REGEX_REGISTRY_ENFORCED_HTTPS = /^https?:\/\/([^\/]+\.)?(yarnpkg\.com|npmjs\.(org|com))(\/|$)/;
 const REGEX_REGISTRY_PREFIX = /^(https?:)?\/\//i;
 function addSuffix(pattern, suffix) {
@@ -1733,7 +1734,7 @@ exports.NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
     let resolved = pathname;
 
     if (!REGEX_REGISTRY_PREFIX.test(pathname)) {
-      resolved = url__default['default'].resolve(addSuffix(registry, "/"), pathname);
+      resolved = url__default["default"].resolve(addSuffix(registry, "/"), pathname);
     }
 
     if (REGEX_REGISTRY_ENFORCED_HTTPS.test(resolved)) {
@@ -1850,7 +1851,7 @@ exports.CliPlugins = class CliPlugins {
     const plugins = Object.keys(this.packageJson.devDependencies).filter(name => this.isPlugin(name));
     const tasks = plugins.map(plugin => {
       return {
-        title: `Run plugin '${chalk__default['default'].cyan(plugin)}'`,
+        title: `Run plugin '${chalk__default["default"].cyan(plugin)}'`,
         task: () => this.cliHooks.emit(CommandStoreKeys.ADD, plugin, ctx)
       };
     });
@@ -1888,15 +1889,13 @@ tslib.__decorate([di.Inject(), tslib.__metadata("design:type", exports.ProjectPa
 
 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({
+    return runScript__default["default"](_extends({
       event: "run"
     }, options, {
       cmd: `${cmd} ${args.join(" ")}`,
@@ -3009,9 +3008,9 @@ const helpers$2 = {};
  * @api public
  */
 
-helpers$2.extend = function ()
-/*objects*/
-{
+helpers$2.extend = function
+  /*objects*/
+() {
   // eslint-disable-next-line prefer-rest-params
   const args = [].slice.call(arguments);
   let opts = {};
@@ -3361,11 +3360,11 @@ helpers.case = function (value, options) {
   }
 };
 
-handlebars__default['default'].registerHelper(helpers$3);
-handlebars__default['default'].registerHelper(helpers$2);
-handlebars__default['default'].registerHelper(helpers$1);
-handlebars__default['default'].registerHelper(helpers$4);
-handlebars__default['default'].registerHelper(helpers);
+handlebars__default["default"].registerHelper(helpers$3);
+handlebars__default["default"].registerHelper(helpers$2);
+handlebars__default["default"].registerHelper(helpers$1);
+handlebars__default["default"].registerHelper(helpers$4);
+handlebars__default["default"].registerHelper(helpers);
 
 function insertImport(fileContent, content) {
   const lines = fileContent.split("\n");
@@ -3396,9 +3395,6 @@ function insertAfter(fileContent, content, pattern) {
 }
 
 const _excluded = ["path"];
-
-const normalizePath = require("normalize-path");
-
 class Renderer {
   constructor() {
     this.configuration = void 0;
@@ -3413,10 +3409,10 @@ class Renderer {
       rootDir
     } = this.mapOptions(path$1, options);
     let content = "";
-    const file = normalizePath(path.join(templateDir, path$1));
+    const file = normalizePath__default["default"](path.join(templateDir, path$1));
 
     if (path$1.endsWith(".hbs")) {
-      content = await Consolidate__default['default'].handlebars(file, data);
+      content = await Consolidate__default["default"].handlebars(file, data);
     } else {
       content = await this.fs.readFile(file, {
         encoding: "utf8"
@@ -3482,10 +3478,12 @@ class Renderer {
     return Fs.existsSync(path.join(templateDir, path$1));
   }
 
-  scan(pattern, options = {}) {
-    return globby__default['default'](pattern.map(s => normalizePath(s)), _extends({}, options, {
+  async scan(pattern, options = {}) {
+    const result = await globby__default["default"](pattern.map(s => normalizePath__default["default"](s)), _extends({}, options, {
+      objectMode: true,
       cwd: this.rootDir
     }));
+    return result.map(entry => entry.path);
   }
 
   relativeFrom(path$1) {
@@ -3527,11 +3525,11 @@ class Renderer {
     } = options;
 
     if (options.baseDir) {
-      output = normalizePath(path.join("/", path.relative(options.baseDir, path$1)));
+      output = normalizePath__default["default"](path.join("/", path.relative(options.baseDir, path$1)));
     }
 
     if (options.basename) {
-      output = normalizePath(path.join(path.dirname(output), options.basename));
+      output = normalizePath__default["default"](path.join(path.dirname(output), options.basename));
     }
 
     output = output.replace(/\.hbs$/, "");
@@ -3591,14 +3589,14 @@ exports.CliYaml = class CliYaml {
       const content = await this.fs.readFile(file, {
         encoding: "utf8"
       });
-      return JsYaml__default['default'].load(content);
+      return JsYaml__default["default"].load(content);
     }
 
     return {};
   }
 
   async write(path$1, obj) {
-    const content = JsYaml__default['default'].dump(obj);
+    const content = JsYaml__default["default"].dump(obj);
     const file = this.fs.findUpFile(this.projectPackageJson.dir, path$1) || path.join(this.projectPackageJson.dir, path$1);
     return this.fs.writeFile(file, content, {
       encoding: "utf8"
@@ -3730,7 +3728,7 @@ exports.CliCore = CliCore_1 = class CliCore {
 
   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."));
+      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."));
       process.exit(1);
     }
 
@@ -3765,7 +3763,7 @@ exports.CliCore = CliCore_1 = class CliCore {
   }
 
   static updateNotifier(pkg) {
-    updateNotifier__default['default']({
+    updateNotifier__default["default"]({
       pkg,
       updateCheckInterval: 0
     }).notify();
@@ -3838,13 +3836,13 @@ function colorizeSection(str, section) {
       const [cmd, ...rest] = line.trim().split(" ");
 
       if (!cmd.startsWith("-")) {
-        return [" ", chalk__default['default'].bold(chalk__default['default'].blue(cmd)), ...rest].join(" ");
+        return [" ", chalk__default["default"].bold(chalk__default["default"].blue(cmd)), ...rest].join(" ");
       }
     }
 
     return line;
   }).join("\n");
-  return [before, after].join(chalk__default['default'].green(section));
+  return [before, after].join(chalk__default["default"].green(section));
 }
 
 commander.Command.prototype.helpInformation = function help() {
@@ -3858,98 +3856,68 @@ commander.Command.prototype.helpInformation = function help() {
     str = colorizeSection(str, "Arguments:");
   }
 
-  return "\n" + str.replace("Usage:", chalk__default['default'].green("Usage:")).replace("Options:", chalk__default['default'].green("Options:")).replace(/<(\w+)>/gi, `<${chalk__default['default'].yellow("$1")}>`).replace(/\[(\w+)]/gi, `[${chalk__default['default'].cyan("$1")}]`) + "\n";
+  return "\n" + str.replace("Usage:", chalk__default["default"].green("Usage:")).replace("Options:", chalk__default["default"].green("Options:")).replace(/<(\w+)>/gi, `<${chalk__default["default"].yellow("$1")}>`).replace(/\[(\w+)]/gi, `[${chalk__default["default"].cyan("$1")}]`) + "\n";
 };
 
 Object.defineProperty(exports, 'Inquirer', {
   enumerable: true,
-  get: function () {
-    return Inquirer__default['default'];
-  }
+  get: function () { return Inquirer__default["default"]; }
 });
 Object.defineProperty(exports, 'Configuration', {
   enumerable: true,
-  get: function () {
-    return di.Configuration;
-  }
+  get: function () { return di.Configuration; }
 });
 Object.defineProperty(exports, 'Constant', {
   enumerable: true,
-  get: function () {
-    return di.Constant;
-  }
+  get: function () { return di.Constant; }
 });
 Object.defineProperty(exports, 'Container', {
   enumerable: true,
-  get: function () {
-    return di.Container;
-  }
+  get: function () { return di.Container; }
 });
 Object.defineProperty(exports, 'DITest', {
   enumerable: true,
-  get: function () {
-    return di.DITest;
-  }
+  get: function () { return di.DITest; }
 });
 Object.defineProperty(exports, 'Inject', {
   enumerable: true,
-  get: function () {
-    return di.Inject;
-  }
+  get: function () { return di.Inject; }
 });
 Object.defineProperty(exports, 'Injectable', {
   enumerable: true,
-  get: function () {
-    return di.Injectable;
-  }
+  get: function () { return di.Injectable; }
 });
 Object.defineProperty(exports, 'InjectorService', {
   enumerable: true,
-  get: function () {
-    return di.InjectorService;
-  }
+  get: function () { return di.InjectorService; }
 });
 Object.defineProperty(exports, 'LocalsContainer', {
   enumerable: true,
-  get: function () {
-    return di.LocalsContainer;
-  }
+  get: function () { return di.LocalsContainer; }
 });
 Object.defineProperty(exports, 'Module', {
   enumerable: true,
-  get: function () {
-    return di.Module;
-  }
+  get: function () { return di.Module; }
 });
 Object.defineProperty(exports, 'Opts', {
   enumerable: true,
-  get: function () {
-    return di.Opts;
-  }
+  get: function () { return di.Opts; }
 });
 Object.defineProperty(exports, 'OverrideProvider', {
   enumerable: true,
-  get: function () {
-    return di.OverrideProvider;
-  }
+  get: function () { return di.OverrideProvider; }
 });
 Object.defineProperty(exports, 'UseOpts', {
   enumerable: true,
-  get: function () {
-    return di.UseOpts;
-  }
+  get: function () { return di.UseOpts; }
 });
 Object.defineProperty(exports, 'Value', {
   enumerable: true,
-  get: function () {
-    return di.Value;
-  }
+  get: function () { return di.Value; }
 });
 Object.defineProperty(exports, 'registerProvider', {
   enumerable: true,
-  get: function () {
-    return di.registerProvider;
-  }
+  get: function () { return di.registerProvider; }
 });
 exports.CliPackageJson = CliPackageJson;
 exports.Command = Command;
@@ -3971,22 +3939,18 @@ exports.loadPlugins = loadPlugins;
 exports.logToCurl = logToCurl;
 exports.mapCommanderArgs = mapCommanderArgs;
 exports.mapCommanderOptions = mapCommanderOptions;
-exports.normalizePath = normalizePath$1;
+exports.normalizePath = normalizePath;
 exports.parseOption = parseOption;
 Object.keys(core).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () {
-      return core[k];
-    }
+    get: function () { return core[k]; }
   });
 });
 Object.keys(logger$1).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () {
-      return logger$1[k];
-    }
+    get: function () { return logger$1[k]; }
   });
 });
 //# sourceMappingURL=index.js.map