@tsed/cli-core 3.20.14 → 3.20.17

package/lib/index.modern.js

@@ -14,16 +14,21 @@ import { EMPTY, throwError, Observable } from 'rxjs';
 import { merge, filter, catchError } from 'rxjs/operators';
 import semver$1 from 'semver';
 import execa from 'execa';
+import 'any-observable/register/rxjs-all';
+import streamToObservable from '@samverschueren/stream-to-observable';
 import Fs, { existsSync } from 'fs-extra';
 import readPkgUp from 'read-pkg-up';
 import axios from 'axios';
-import querystring from 'querystring';
+import querystring, { stringify } from 'querystring';
 import tunnel from 'tunnel';
 import { camelCase, snakeCase } from 'change-case';
 import parse from 'url-parse';
 import chalk from 'chalk';
 import url from 'url';
+import registry_url from 'registry-url';
+import runScript from '@npmcli/run-script';
 import Consolidate from 'consolidate';
+import normalizePath$1 from 'normalize-path';
 import globby from 'globby';
 import handlebars from 'handlebars';
 import JsYaml from 'js-yaml';
@@ -131,10 +136,6 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-require("any-observable/register/rxjs-all");
-
-const streamToObservable = require("@samverschueren/stream-to-observable");
-
 const split = require("split");
 
 let CliExeca = class CliExeca {
@@ -176,14 +177,14 @@ CliExeca = __decorate([Injectable()], CliExeca);
 
 const fixPath = require("normalize-path");
 
-function normalizePath$1(item, ...paths) {
+function normalizePath(item, ...paths) {
   if (isString(item)) {
     const path = join(item, ...paths);
     return fixPath(path);
   }
 
   if (isArray(item)) {
-    return item.map(item => normalizePath$1(item));
+    return item.map(item => normalizePath(item));
   }
 
   return item;
@@ -199,7 +200,7 @@ let CliFs = class CliFs {
   }
 
   join(...args) {
-    return normalizePath$1(join(...args));
+    return normalizePath(join(...args));
   }
 
   async readFile(file, encoding) {
@@ -1490,7 +1491,7 @@ let CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClie
   }
 
   static getParamsSerializer(params) {
-    return querystring.stringify(cleanObject(params));
+    return stringify(cleanObject(params));
   }
 
   async $onInit() {
@@ -1647,9 +1648,7 @@ async function loadPlugins(injector) {
 }
 
 var NpmRegistryClient_1;
-
-const HOST = require("registry-url")();
-
+const HOST = registry_url();
 const REGEX_REGISTRY_ENFORCED_HTTPS = /^https?:\/\/([^\/]+\.)?(yarnpkg\.com|npmjs\.(org|com))(\/|$)/;
 const REGEX_REGISTRY_PREFIX = /^(https?:)?\/\//i;
 function addSuffix(pattern, suffix) {
@@ -1816,7 +1815,7 @@ let CliPlugins = class CliPlugins {
     const tasks = plugins.map(plugin => {
       return {
         title: `Run plugin '${chalk.cyan(plugin)}'`,
-        task: () => this.cliHooks.emit(CommandStoreKeys.ADD, plugin)
+        task: () => this.cliHooks.emit(CommandStoreKeys.ADD, plugin, ctx)
       };
     });
     return [...tasks, {
@@ -1853,8 +1852,6 @@ __decorate([Inject(), __metadata("design:type", ProjectPackageJson)], CliPlugins
 
 CliPlugins = __decorate([Injectable()], CliPlugins);
 
-const runScript = require("@npmcli/run-script");
-
 let CliRunScript = class CliRunScript {
   constructor() {
     this.projectPackageJson = void 0;
@@ -2974,9 +2971,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,9 +3358,6 @@ function insertAfter(fileContent, content, pattern) {
 }
 
 const _excluded = ["path"];
-
-const normalizePath = require("normalize-path");
-
 class Renderer {
   constructor() {
     this.configuration = void 0;
@@ -3378,7 +3372,7 @@ class Renderer {
       rootDir
     } = this.mapOptions(path, options);
     let content = "";
-    const file = normalizePath(join(templateDir, path));
+    const file = normalizePath$1(join(templateDir, path));
 
     if (path.endsWith(".hbs")) {
       content = await Consolidate.handlebars(file, data);
@@ -3449,10 +3443,12 @@ class Renderer {
     return existsSync(join(templateDir, path));
   }
 
-  scan(pattern, options = {}) {
-    return globby(pattern.map(s => normalizePath(s)), _extends({}, options, {
+  async scan(pattern, options = {}) {
+    const result = await globby(pattern.map(s => normalizePath$1(s)), _extends({}, options, {
+      objectMode: true,
       cwd: this.rootDir
     }));
+    return result.map(entry => entry.path);
   }
 
   relativeFrom(path) {
@@ -3494,11 +3490,11 @@ class Renderer {
     } = options;
 
     if (options.baseDir) {
-      output = normalizePath(join("/", relative(options.baseDir, path)));
+      output = normalizePath$1(join("/", relative(options.baseDir, path)));
     }
 
     if (options.basename) {
-      output = normalizePath(join(dirname(output), options.basename));
+      output = normalizePath$1(join(dirname(output), options.basename));
     }
 
     output = output.replace(/\.hbs$/, "");
@@ -3828,5 +3824,5 @@ Command$1.prototype.helpInformation = function help() {
   return "\n" + str.replace("Usage:", chalk.green("Usage:")).replace("Options:", chalk.green("Options:")).replace(/<(\w+)>/gi, `<${chalk.yellow("$1")}>`).replace(/\[(\w+)]/gi, `[${chalk.cyan("$1")}]`) + "\n";
 };
 
-export { CliConfiguration, CliCore, CliDockerComposeYaml, CliExeca, CliFs, CliHttpClient, CliPackageJson, CliPlugins, CliRunScript, CliService, CliYaml, Command, NpmRegistryClient, OnAdd, OnExec, OnPostInstall, OnPrompt, PackageManager, ProjectPackageJson, Renderer, RootRendererService, SCOPE_SEPARATOR, ScriptsRendererService, SrcRendererService, addSuffix, createInjector, createSubTasks, createTasks, createTasksRunner, getCommandMetadata, getLogger, getPackageJson, loadPlugins, logToCurl, mapCommanderArgs, mapCommanderOptions, normalizePath$1 as normalizePath, parseOption };
+export { CliConfiguration, CliCore, CliDockerComposeYaml, CliExeca, CliFs, CliHttpClient, CliPackageJson, CliPlugins, CliRunScript, CliService, CliYaml, Command, NpmRegistryClient, OnAdd, OnExec, OnPostInstall, OnPrompt, PackageManager, ProjectPackageJson, Renderer, RootRendererService, SCOPE_SEPARATOR, ScriptsRendererService, SrcRendererService, addSuffix, createInjector, createSubTasks, createTasks, createTasksRunner, getCommandMetadata, getLogger, getPackageJson, loadPlugins, logToCurl, mapCommanderArgs, mapCommanderOptions, normalizePath, parseOption };
 //# sourceMappingURL=index.modern.js.map