@tsed/cli-core 6.0.0-alpha.8 → 6.0.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (149) hide show
  1. package/lib/esm/CliCore.js +0 -1
  2. package/lib/esm/decorators/command.js +0 -1
  3. package/lib/esm/decorators/index.js +0 -1
  4. package/lib/esm/decorators/on.js +0 -1
  5. package/lib/esm/decorators/onAdd.js +0 -1
  6. package/lib/esm/decorators/onExec.js +0 -1
  7. package/lib/esm/decorators/onPostInstall.js +0 -1
  8. package/lib/esm/decorators/onPrompt.js +0 -1
  9. package/lib/esm/domains/CliError.js +0 -1
  10. package/lib/esm/domains/CommandStoreKeys.js +0 -1
  11. package/lib/esm/index.js +0 -1
  12. package/lib/esm/interfaces/CliDefaultOptions.js +0 -1
  13. package/lib/esm/interfaces/CommandMetadata.js +0 -1
  14. package/lib/esm/interfaces/CommandParameters.js +0 -1
  15. package/lib/esm/interfaces/CommandProvider.js +0 -1
  16. package/lib/esm/interfaces/PackageJson.js +0 -1
  17. package/lib/esm/interfaces/ProjectPreferences.js +0 -1
  18. package/lib/esm/interfaces/Tasks.js +1 -2
  19. package/lib/esm/interfaces/index.js +0 -1
  20. package/lib/esm/packageManagers/PackageManagersModule.js +3 -4
  21. package/lib/esm/packageManagers/index.js +0 -1
  22. package/lib/esm/packageManagers/supports/BaseManager.js +0 -2
  23. package/lib/esm/packageManagers/supports/BunManager.js +0 -2
  24. package/lib/esm/packageManagers/supports/NpmManager.js +0 -1
  25. package/lib/esm/packageManagers/supports/PNpmManager.js +0 -1
  26. package/lib/esm/packageManagers/supports/YarnBerryManager.js +1 -3
  27. package/lib/esm/packageManagers/supports/YarnManager.js +0 -2
  28. package/lib/esm/services/CliConfiguration.js +0 -1
  29. package/lib/esm/services/CliDockerComposeYaml.js +0 -1
  30. package/lib/esm/services/CliExeca.js +4 -4
  31. package/lib/esm/services/CliFs.js +0 -1
  32. package/lib/esm/services/CliHooks.js +0 -1
  33. package/lib/esm/services/CliHttpClient.js +0 -1
  34. package/lib/esm/services/CliHttpLogClient.js +0 -1
  35. package/lib/esm/services/CliLoadFile.js +0 -1
  36. package/lib/esm/services/CliPackageJson.js +0 -1
  37. package/lib/esm/services/CliPlugins.js +0 -1
  38. package/lib/esm/services/CliProxyAgent.js +0 -1
  39. package/lib/esm/services/CliRunScript.js +0 -1
  40. package/lib/esm/services/CliService.js +4 -5
  41. package/lib/esm/services/CliYaml.js +0 -1
  42. package/lib/esm/services/NpmRegistryClient.js +0 -1
  43. package/lib/esm/services/ProjectPackageJson.js +2 -3
  44. package/lib/esm/services/Renderer.js +2 -3
  45. package/lib/esm/services/index.js +0 -1
  46. package/lib/esm/utils/coerce.js +0 -1
  47. package/lib/esm/utils/createInjector.js +0 -1
  48. package/lib/esm/utils/createTasksRunner.js +17 -39
  49. package/lib/esm/utils/getCommandMetadata.js +0 -1
  50. package/lib/esm/utils/getTemplateDirectory.js +2 -3
  51. package/lib/esm/utils/hbs/array.js +0 -1
  52. package/lib/esm/utils/hbs/collection.js +0 -1
  53. package/lib/esm/utils/hbs/comparison.js +0 -1
  54. package/lib/esm/utils/hbs/index.js +0 -1
  55. package/lib/esm/utils/hbs/object.js +0 -1
  56. package/lib/esm/utils/hbs/switch.js +0 -1
  57. package/lib/esm/utils/index.js +0 -1
  58. package/lib/esm/utils/isValidVersion.js +0 -1
  59. package/lib/esm/utils/loadPlugins.js +1 -3
  60. package/lib/esm/utils/logToCurl.js +0 -1
  61. package/lib/esm/utils/mapCommanderArgs.js +0 -1
  62. package/lib/esm/utils/mapCommanderOptions.js +4 -2
  63. package/lib/esm/utils/parseOption.js +0 -1
  64. package/lib/esm/utils/patchCommander.js +0 -1
  65. package/lib/esm/utils/renderer/insertAfter.js +0 -1
  66. package/lib/esm/utils/renderer/insertImport.js +0 -1
  67. package/lib/esm/utils/resolveConfiguration.js +0 -1
  68. package/lib/esm/utils/streamToObservable.js +0 -1
  69. package/lib/types/interfaces/Tasks.d.ts +2 -2
  70. package/lib/types/packageManagers/PackageManagersModule.d.ts +3 -4
  71. package/lib/types/packageManagers/supports/BaseManager.d.ts +5 -7
  72. package/lib/types/packageManagers/supports/BunManager.d.ts +2 -2
  73. package/lib/types/packageManagers/supports/YarnBerryManager.d.ts +3 -6
  74. package/lib/types/packageManagers/supports/YarnManager.d.ts +2 -2
  75. package/lib/types/services/CliDockerComposeYaml.d.ts +1 -1
  76. package/lib/types/services/CliExeca.d.ts +5 -21
  77. package/lib/types/services/CliFs.d.ts +4 -4
  78. package/lib/types/services/CliYaml.d.ts +1 -1
  79. package/lib/types/utils/createTasksRunner.d.ts +2 -2
  80. package/lib/types/utils/mapCommanderOptions.d.ts +1 -1
  81. package/package.json +41 -46
  82. package/lib/esm/CliCore.js.map +0 -1
  83. package/lib/esm/decorators/command.js.map +0 -1
  84. package/lib/esm/decorators/index.js.map +0 -1
  85. package/lib/esm/decorators/on.js.map +0 -1
  86. package/lib/esm/decorators/onAdd.js.map +0 -1
  87. package/lib/esm/decorators/onExec.js.map +0 -1
  88. package/lib/esm/decorators/onPostInstall.js.map +0 -1
  89. package/lib/esm/decorators/onPrompt.js.map +0 -1
  90. package/lib/esm/domains/CliError.js.map +0 -1
  91. package/lib/esm/domains/CommandStoreKeys.js.map +0 -1
  92. package/lib/esm/index.js.map +0 -1
  93. package/lib/esm/interfaces/CliDefaultOptions.js.map +0 -1
  94. package/lib/esm/interfaces/CommandMetadata.js.map +0 -1
  95. package/lib/esm/interfaces/CommandParameters.js.map +0 -1
  96. package/lib/esm/interfaces/CommandProvider.js.map +0 -1
  97. package/lib/esm/interfaces/PackageJson.js.map +0 -1
  98. package/lib/esm/interfaces/ProjectPreferences.js.map +0 -1
  99. package/lib/esm/interfaces/Tasks.js.map +0 -1
  100. package/lib/esm/interfaces/index.js.map +0 -1
  101. package/lib/esm/packageManagers/PackageManagersModule.js.map +0 -1
  102. package/lib/esm/packageManagers/index.js.map +0 -1
  103. package/lib/esm/packageManagers/supports/BaseManager.js.map +0 -1
  104. package/lib/esm/packageManagers/supports/BunManager.js.map +0 -1
  105. package/lib/esm/packageManagers/supports/NpmManager.js.map +0 -1
  106. package/lib/esm/packageManagers/supports/PNpmManager.js.map +0 -1
  107. package/lib/esm/packageManagers/supports/YarnBerryManager.js.map +0 -1
  108. package/lib/esm/packageManagers/supports/YarnManager.js.map +0 -1
  109. package/lib/esm/services/CliConfiguration.js.map +0 -1
  110. package/lib/esm/services/CliDockerComposeYaml.js.map +0 -1
  111. package/lib/esm/services/CliExeca.js.map +0 -1
  112. package/lib/esm/services/CliFs.js.map +0 -1
  113. package/lib/esm/services/CliHooks.js.map +0 -1
  114. package/lib/esm/services/CliHttpClient.js.map +0 -1
  115. package/lib/esm/services/CliHttpLogClient.js.map +0 -1
  116. package/lib/esm/services/CliLoadFile.js.map +0 -1
  117. package/lib/esm/services/CliPackageJson.js.map +0 -1
  118. package/lib/esm/services/CliPlugins.js.map +0 -1
  119. package/lib/esm/services/CliProxyAgent.js.map +0 -1
  120. package/lib/esm/services/CliRunScript.js.map +0 -1
  121. package/lib/esm/services/CliService.js.map +0 -1
  122. package/lib/esm/services/CliYaml.js.map +0 -1
  123. package/lib/esm/services/NpmRegistryClient.js.map +0 -1
  124. package/lib/esm/services/ProjectPackageJson.js.map +0 -1
  125. package/lib/esm/services/Renderer.js.map +0 -1
  126. package/lib/esm/services/index.js.map +0 -1
  127. package/lib/esm/utils/coerce.js.map +0 -1
  128. package/lib/esm/utils/createInjector.js.map +0 -1
  129. package/lib/esm/utils/createTasksRunner.js.map +0 -1
  130. package/lib/esm/utils/getCommandMetadata.js.map +0 -1
  131. package/lib/esm/utils/getTemplateDirectory.js.map +0 -1
  132. package/lib/esm/utils/hbs/array.js.map +0 -1
  133. package/lib/esm/utils/hbs/collection.js.map +0 -1
  134. package/lib/esm/utils/hbs/comparison.js.map +0 -1
  135. package/lib/esm/utils/hbs/index.js.map +0 -1
  136. package/lib/esm/utils/hbs/object.js.map +0 -1
  137. package/lib/esm/utils/hbs/switch.js.map +0 -1
  138. package/lib/esm/utils/index.js.map +0 -1
  139. package/lib/esm/utils/isValidVersion.js.map +0 -1
  140. package/lib/esm/utils/loadPlugins.js.map +0 -1
  141. package/lib/esm/utils/logToCurl.js.map +0 -1
  142. package/lib/esm/utils/mapCommanderArgs.js.map +0 -1
  143. package/lib/esm/utils/mapCommanderOptions.js.map +0 -1
  144. package/lib/esm/utils/parseOption.js.map +0 -1
  145. package/lib/esm/utils/patchCommander.js.map +0 -1
  146. package/lib/esm/utils/renderer/insertAfter.js.map +0 -1
  147. package/lib/esm/utils/renderer/insertImport.js.map +0 -1
  148. package/lib/esm/utils/resolveConfiguration.js.map +0 -1
  149. package/lib/esm/utils/streamToObservable.js.map +0 -1
@@ -103,4 +103,3 @@ CliCore = CliCore_1 = __decorate([
103
103
  })
104
104
  ], CliCore);
105
105
  export { CliCore };
106
- //# sourceMappingURL=CliCore.js.map
@@ -4,4 +4,3 @@ import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
4
4
  export function Command(options) {
5
5
  return useDecorators(Injectable({ type: "command" }), StoreSet(CommandStoreKeys.COMMAND, options));
6
6
  }
7
- //# sourceMappingURL=command.js.map
@@ -3,4 +3,3 @@ export * from "./onAdd.js";
3
3
  export * from "./onExec.js";
4
4
  export * from "./onPostInstall.js";
5
5
  export * from "./onPrompt.js";
6
- //# sourceMappingURL=index.js.map
@@ -6,4 +6,3 @@ export function On(hookName, name) {
6
6
  })(target);
7
7
  };
8
8
  }
9
- //# sourceMappingURL=on.js.map
@@ -3,4 +3,3 @@ import { On } from "./on.js";
3
3
  export function OnAdd(cliPlugin) {
4
4
  return On(CommandStoreKeys.ADD, cliPlugin);
5
5
  }
6
- //# sourceMappingURL=onAdd.js.map
@@ -3,4 +3,3 @@ import { On } from "./on.js";
3
3
  export function OnExec(cmdName) {
4
4
  return On(CommandStoreKeys.EXEC_HOOKS, cmdName);
5
5
  }
6
- //# sourceMappingURL=onExec.js.map
@@ -3,4 +3,3 @@ import { On } from "./on.js";
3
3
  export function OnPostInstall(cmdName) {
4
4
  return On(CommandStoreKeys.POST_INSTALL_HOOKS, cmdName);
5
5
  }
6
- //# sourceMappingURL=onPostInstall.js.map
@@ -3,4 +3,3 @@ import { On } from "./on.js";
3
3
  export function OnPrompt(cmdName) {
4
4
  return On(CommandStoreKeys.PROMPT_HOOKS, cmdName);
5
5
  }
6
- //# sourceMappingURL=onPrompt.js.map
@@ -7,4 +7,3 @@ export class CliError extends Error {
7
7
  this.stack = origin.stack;
8
8
  }
9
9
  }
10
- //# sourceMappingURL=CliError.js.map
@@ -6,4 +6,3 @@ export var CommandStoreKeys;
6
6
  CommandStoreKeys["POST_INSTALL_HOOKS"] = "$onPostInstall";
7
7
  CommandStoreKeys["PROMPT_HOOKS"] = "$onPrompt";
8
8
  })(CommandStoreKeys || (CommandStoreKeys = {}));
9
- //# sourceMappingURL=CommandStoreKeys.js.map
package/lib/esm/index.js CHANGED
@@ -11,4 +11,3 @@ export * from "@tsed/di";
11
11
  export * from "@tsed/logger";
12
12
  export * from "@tsed/normalize-path";
13
13
  export { Inquirer };
14
- //# sourceMappingURL=index.js.map
@@ -1,2 +1 @@
1
1
  export {};
2
- //# sourceMappingURL=CliDefaultOptions.js.map
@@ -1,2 +1 @@
1
1
  export {};
2
- //# sourceMappingURL=CommandMetadata.js.map
@@ -1,2 +1 @@
1
1
  import { Type } from "@tsed/core";
2
- //# sourceMappingURL=CommandParameters.js.map
@@ -1,2 +1 @@
1
1
  export {};
2
- //# sourceMappingURL=CommandProvider.js.map
@@ -1,2 +1 @@
1
1
  export {};
2
- //# sourceMappingURL=PackageJson.js.map
@@ -5,4 +5,3 @@ export var PackageManager;
5
5
  PackageManager["NPM"] = "npm";
6
6
  PackageManager["PNPM"] = "pnpm";
7
7
  })(PackageManager || (PackageManager = {}));
8
- //# sourceMappingURL=ProjectPreferences.js.map
@@ -1,2 +1 @@
1
- export {};
2
- //# sourceMappingURL=Tasks.js.map
1
+ import {} from "listr2";
@@ -6,4 +6,3 @@ export * from "./CommandProvider.js";
6
6
  export * from "./PackageJson.js";
7
7
  export * from "./ProjectPreferences.js";
8
8
  export * from "./Tasks.js";
9
- //# sourceMappingURL=index.js.map
@@ -68,17 +68,17 @@ let PackageManagersModule = class PackageManagersModule {
68
68
  {
69
69
  title: `Installing dependencies using ${packageManager.name}`,
70
70
  skip: () => !this.projectPackageJson.reinstall,
71
- task: () => packageManager.install(options).pipe(errorPipe())
71
+ task: () => packageManager.install(options) // .pipe(errorPipe())
72
72
  },
73
73
  {
74
74
  title: `Add dependencies using ${packageManager.name}`,
75
75
  skip: () => !deps.length,
76
- task: () => packageManager.add(deps, options).pipe(errorPipe())
76
+ task: () => packageManager.add(deps, options) //.pipe(errorPipe())
77
77
  },
78
78
  {
79
79
  title: `Add devDependencies using ${packageManager.name}`,
80
80
  skip: () => !devDeps.length,
81
- task: () => packageManager.addDev(devDeps, options).pipe(errorPipe())
81
+ task: () => packageManager.addDev(devDeps, options) //.pipe(errorPipe())
82
82
  },
83
83
  {
84
84
  title: "Refresh",
@@ -129,4 +129,3 @@ PackageManagersModule = __decorate([
129
129
  __metadata("design:paramtypes", [Array])
130
130
  ], PackageManagersModule);
131
131
  export { PackageManagersModule };
132
- //# sourceMappingURL=PackageManagersModule.js.map
@@ -3,4 +3,3 @@ export * from "./supports/BaseManager.js";
3
3
  export * from "./supports/NpmManager.js";
4
4
  export * from "./supports/PNpmManager.js";
5
5
  export * from "./supports/YarnManager.js";
6
- //# sourceMappingURL=index.js.map
@@ -1,6 +1,5 @@
1
1
  import { __decorate, __metadata } from "tslib";
2
2
  import { Inject } from "@tsed/di";
3
- import execa from "execa";
4
3
  import { Observable } from "rxjs";
5
4
  import { CliExeca } from "../../services/CliExeca.js";
6
5
  export class BaseManager {
@@ -28,4 +27,3 @@ __decorate([
28
27
  Inject(CliExeca),
29
28
  __metadata("design:type", CliExeca)
30
29
  ], BaseManager.prototype, "cliExeca", void 0);
31
- //# sourceMappingURL=BaseManager.js.map
@@ -1,6 +1,5 @@
1
1
  import { __decorate } from "tslib";
2
2
  import { Injectable } from "@tsed/di";
3
- import execa from "execa";
4
3
  import { Observable } from "rxjs";
5
4
  import { BaseManager } from "./BaseManager.js";
6
5
  let BunManager = class BunManager extends BaseManager {
@@ -25,4 +24,3 @@ BunManager = __decorate([
25
24
  })
26
25
  ], BunManager);
27
26
  export { BunManager };
28
- //# sourceMappingURL=BunManager.js.map
@@ -24,4 +24,3 @@ NpmManager = __decorate([
24
24
  })
25
25
  ], NpmManager);
26
26
  export { NpmManager };
27
- //# sourceMappingURL=NpmManager.js.map
@@ -24,4 +24,3 @@ PNpmManager = __decorate([
24
24
  })
25
25
  ], PNpmManager);
26
26
  export { PNpmManager };
27
- //# sourceMappingURL=PNpmManager.js.map
@@ -1,6 +1,5 @@
1
1
  import { __decorate, __metadata } from "tslib";
2
2
  import { Inject, Injectable } from "@tsed/di";
3
- import execa from "execa";
4
3
  import { join } from "path";
5
4
  import { Observable } from "rxjs";
6
5
  import { CliYaml } from "../../services/CliYaml.js";
@@ -15,7 +14,7 @@ let YarnBerryManager = class YarnBerryManager extends BaseManager {
15
14
  // init yarn v1
16
15
  this.install(options);
17
16
  // then switch write file
18
- await this.cliYaml.write(join(options.cwd, ".yarnrc.yml"), {
17
+ await this.cliYaml.write(join(String(options.cwd), ".yarnrc.yml"), {
19
18
  nodeLinker: "node-modules"
20
19
  });
21
20
  // then switch to berry
@@ -41,4 +40,3 @@ YarnBerryManager = __decorate([
41
40
  })
42
41
  ], YarnBerryManager);
43
42
  export { YarnBerryManager };
44
- //# sourceMappingURL=YarnBerryManager.js.map
@@ -1,6 +1,5 @@
1
1
  import { __decorate } from "tslib";
2
2
  import { Injectable } from "@tsed/di";
3
- import execa from "execa";
4
3
  import { Observable } from "rxjs";
5
4
  import { BaseManager } from "./BaseManager.js";
6
5
  let YarnManager = class YarnManager extends BaseManager {
@@ -25,4 +24,3 @@ YarnManager = __decorate([
25
24
  })
26
25
  ], YarnManager);
27
26
  export { YarnManager };
28
- //# sourceMappingURL=YarnManager.js.map
@@ -15,4 +15,3 @@ CliConfiguration = __decorate([
15
15
  __metadata("design:paramtypes", [])
16
16
  ], CliConfiguration);
17
17
  export { CliConfiguration };
18
- //# sourceMappingURL=CliConfiguration.js.map
@@ -96,4 +96,3 @@ CliDockerComposeYaml = __decorate([
96
96
  Injectable()
97
97
  ], CliDockerComposeYaml);
98
98
  export { CliDockerComposeYaml };
99
- //# sourceMappingURL=CliDockerComposeYaml.js.map
@@ -1,6 +1,6 @@
1
1
  import { __decorate } from "tslib";
2
2
  import { Injectable } from "@tsed/di";
3
- import execa from "execa";
3
+ import { execa, execaSync } from "execa";
4
4
  import { filter, mergeWith } from "rxjs/operators";
5
5
  // @ts-ignore
6
6
  import split from "split";
@@ -8,6 +8,7 @@ import { streamToObservable } from "../utils/streamToObservable.js";
8
8
  let CliExeca = class CliExeca {
9
9
  constructor() {
10
10
  this.raw = execa;
11
+ this.rawSync = execaSync;
11
12
  }
12
13
  /**
13
14
  *
@@ -22,17 +23,16 @@ let CliExeca = class CliExeca {
22
23
  return stdout.pipe(mergeWith(stderr)).pipe(filter(Boolean));
23
24
  }
24
25
  runSync(cmd, args, opts) {
25
- return this.raw.sync(cmd, args, opts);
26
+ return this.rawSync(cmd, args, opts);
26
27
  }
27
28
  async getAsync(cmd, args, opts) {
28
29
  return (await this.raw(cmd, args, opts)).stdout;
29
30
  }
30
31
  get(cmd, args, opts) {
31
- return this.raw.sync(cmd, args, opts).stdout;
32
+ return this.rawSync(cmd, args, opts).stdout;
32
33
  }
33
34
  };
34
35
  CliExeca = __decorate([
35
36
  Injectable()
36
37
  ], CliExeca);
37
38
  export { CliExeca };
38
- //# sourceMappingURL=CliExeca.js.map
@@ -65,4 +65,3 @@ CliFs = __decorate([
65
65
  Injectable()
66
66
  ], CliFs);
67
67
  export { CliFs };
68
- //# sourceMappingURL=CliFs.js.map
@@ -28,4 +28,3 @@ CliHooks = __decorate([
28
28
  Injectable()
29
29
  ], CliHooks);
30
30
  export { CliHooks };
31
- //# sourceMappingURL=CliHooks.js.map
@@ -101,4 +101,3 @@ CliHttpClient = CliHttpClient_1 = __decorate([
101
101
  Injectable()
102
102
  ], CliHttpClient);
103
103
  export { CliHttpClient };
104
- //# sourceMappingURL=CliHttpClient.js.map
@@ -77,4 +77,3 @@ CliHttpLogClient = __decorate([
77
77
  __metadata("design:paramtypes", [Object])
78
78
  ], CliHttpLogClient);
79
79
  export { CliHttpLogClient };
80
- //# sourceMappingURL=CliHttpLogClient.js.map
@@ -61,4 +61,3 @@ CliLoadFile = __decorate([
61
61
  __metadata("design:paramtypes", [])
62
62
  ], CliLoadFile);
63
63
  export { CliLoadFile };
64
- //# sourceMappingURL=CliLoadFile.js.map
@@ -10,4 +10,3 @@ registerProvider({
10
10
  return configuration.pkg || {};
11
11
  }
12
12
  });
13
- //# sourceMappingURL=CliPackageJson.js.map
@@ -81,4 +81,3 @@ CliPlugins = __decorate([
81
81
  Injectable()
82
82
  ], CliPlugins);
83
83
  export { CliPlugins };
84
- //# sourceMappingURL=CliPlugins.js.map
@@ -89,4 +89,3 @@ CliProxyAgent = __decorate([
89
89
  })
90
90
  ], CliProxyAgent);
91
91
  export { CliProxyAgent };
92
- //# sourceMappingURL=CliProxyAgent.js.map
@@ -24,4 +24,3 @@ CliRunScript = __decorate([
24
24
  Injectable()
25
25
  ], CliRunScript);
26
26
  export { CliRunScript };
27
- //# sourceMappingURL=CliRunScript.js.map
@@ -10,8 +10,8 @@ import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
10
10
  import { PackageManagersModule } from "../packageManagers/index.js";
11
11
  import { createSubTasks, createTasksRunner } from "../utils/createTasksRunner.js";
12
12
  import { getCommandMetadata } from "../utils/getCommandMetadata.js";
13
+ import { mapCommanderOptions } from "../utils/index.js";
13
14
  import { mapCommanderArgs } from "../utils/mapCommanderArgs.js";
14
- import { mapCommanderOptions } from "../utils/mapCommanderOptions.js";
15
15
  import { parseOption } from "../utils/parseOption.js";
16
16
  import { CliHooks } from "./CliHooks.js";
17
17
  import { ProjectPackageJson } from "./ProjectPackageJson.js";
@@ -144,10 +144,10 @@ let CliService = class CliService {
144
144
  return this.commands.get(name).command;
145
145
  }
146
146
  let cmd = this.program.command(name);
147
- const onAction = (...commanderArgs) => {
147
+ const onAction = (commandName) => {
148
148
  const [, ...rawArgs] = cmd.args;
149
- const mappedArgs = mapCommanderArgs(args, commanderArgs);
150
- const allOpts = mapCommanderOptions(this.program.commands);
149
+ const mappedArgs = mapCommanderArgs(args, this.program.args.filter((arg) => commandName === arg));
150
+ const allOpts = mapCommanderOptions(commandName, this.program.commands);
151
151
  const data = {
152
152
  ...allOpts,
153
153
  verbose: !!this.program.opts().verbose,
@@ -277,4 +277,3 @@ CliService = __decorate([
277
277
  Injectable()
278
278
  ], CliService);
279
279
  export { CliService };
280
- //# sourceMappingURL=CliService.js.map
@@ -20,4 +20,3 @@ CliYaml = __decorate([
20
20
  Injectable()
21
21
  ], CliYaml);
22
22
  export { CliYaml };
23
- //# sourceMappingURL=CliYaml.js.map
@@ -114,4 +114,3 @@ NpmRegistryClient = NpmRegistryClient_1 = __decorate([
114
114
  Injectable()
115
115
  ], NpmRegistryClient);
116
116
  export { NpmRegistryClient };
117
- //# sourceMappingURL=NpmRegistryClient.js.map
@@ -2,7 +2,7 @@ import { __decorate, __metadata, __param } from "tslib";
2
2
  import { getValue, setValue } from "@tsed/core";
3
3
  import { Configuration, Injectable } from "@tsed/di";
4
4
  import { dirname, join } from "path";
5
- import readPkgUp from "read-pkg-up";
5
+ import { readPackageUpSync } from "read-pkg-up";
6
6
  import { isValidVersion } from "../utils/isValidVersion.js";
7
7
  import { CliFs } from "./CliFs.js";
8
8
  function sortKeys(obj) {
@@ -241,7 +241,7 @@ let ProjectPackageJson = class ProjectPackageJson {
241
241
  const pkgPath = join(String(cwd), "package.json");
242
242
  const fileExists = this.fs.exists(pkgPath);
243
243
  if (!disableReadUpPkg && !fileExists) {
244
- const result = readPkgUp.sync({
244
+ const result = readPackageUpSync({
245
245
  cwd
246
246
  });
247
247
  if (result && result.path) {
@@ -275,4 +275,3 @@ ProjectPackageJson = __decorate([
275
275
  __metadata("design:paramtypes", [Object, CliFs])
276
276
  ], ProjectPackageJson);
277
277
  export { ProjectPackageJson };
278
- //# sourceMappingURL=ProjectPackageJson.js.map
@@ -2,11 +2,11 @@ import { __decorate, __metadata } from "tslib";
2
2
  import "../utils/hbs/index.js";
3
3
  import { isString } from "@tsed/core";
4
4
  import { Configuration, Constant, Inject, Injectable } from "@tsed/di";
5
+ import { normalizePath } from "@tsed/normalize-path";
5
6
  import Consolidate from "consolidate";
6
7
  import fs from "fs-extra";
7
- import globby from "globby";
8
+ import { globby } from "globby";
8
9
  import handlebars from "handlebars";
9
- import normalizePath from "normalize-path";
10
10
  import { basename, dirname, join, relative } from "path";
11
11
  import { Observable } from "rxjs";
12
12
  import { insertAfter } from "../utils/renderer/insertAfter.js";
@@ -170,4 +170,3 @@ ScriptsRendererService = __decorate([
170
170
  Injectable()
171
171
  ], ScriptsRendererService);
172
172
  export { ScriptsRendererService };
173
- //# sourceMappingURL=Renderer.js.map
@@ -13,4 +13,3 @@ export * from "./CliYaml.js";
13
13
  export * from "./NpmRegistryClient.js";
14
14
  export * from "./ProjectPackageJson.js";
15
15
  export * from "./Renderer.js";
16
- //# sourceMappingURL=index.js.map
@@ -13,4 +13,3 @@ export function coerce(value) {
13
13
  }
14
14
  return value;
15
15
  }
16
- //# sourceMappingURL=coerce.js.map
@@ -43,4 +43,3 @@ export function createInjector(settings = {}) {
43
43
  }
44
44
  return injector;
45
45
  }
46
- //# sourceMappingURL=createInjector.js.map
@@ -1,62 +1,40 @@
1
1
  // @ts-ignore
2
2
  import { isFunction } from "@tsed/core";
3
- import { Listr, Logger } from "listr2";
3
+ import { DefaultRenderer, Listr, ListrLogger, VerboseRenderer } from "listr2";
4
4
  import { getLogger } from "./createInjector.js";
5
- class CustomLogger extends Logger {
6
- fail(message) {
7
- getLogger()?.error("[FAIL]", message);
8
- }
9
- skip(message) {
10
- getLogger()?.info("[SKIP]", message);
11
- }
12
- success(message) {
13
- getLogger()?.info("[SUCCESS]", message);
14
- }
15
- data(message) {
16
- getLogger()?.info("[DATA]", message);
17
- }
18
- start(message) {
19
- getLogger()?.info("[START]", message);
20
- }
21
- title(message) {
22
- getLogger()?.info("[TITLE]", message);
23
- }
24
- retry(message) {
25
- getLogger()?.info("[RETRY]", message);
26
- }
27
- rollback(message) {
28
- getLogger()?.info("[ROLLBACK]", message);
5
+ class CustomLogger extends ListrLogger {
6
+ log(level, message, options) {
7
+ if (["FAILED"].includes(level)) {
8
+ getLogger()?.error(`[${level}]`, message);
9
+ }
10
+ else {
11
+ getLogger()?.info(`[${level}]`, message);
12
+ }
29
13
  }
30
14
  }
31
15
  function getOptions({ bindLogger = true, ...ctx }) {
32
16
  const useRawRenderer = !(!ctx.verbose && !process.env.CI);
33
- const rendererOptions = useRawRenderer && bindLogger
34
- ? {
35
- logger: CustomLogger
36
- }
37
- : {};
38
17
  return {
39
- ...ctx,
40
- rendererSilent: process.env.NODE_ENV === "test",
41
- rendererFallback: useRawRenderer,
42
- renderer: useRawRenderer ? "verbose" : "default",
43
- nonTTYRendererOptions: rendererOptions,
44
- rendererOptions
18
+ silentRendererCondition: process.env.NODE_ENV === "test",
19
+ renderer: useRawRenderer ? VerboseRenderer : DefaultRenderer,
20
+ rendererOptions: useRawRenderer && bindLogger
21
+ ? {
22
+ logger: new CustomLogger()
23
+ }
24
+ : undefined
45
25
  };
46
26
  }
47
27
  export function createTasks(tasks, ctx) {
48
28
  return new Listr(tasks, getOptions(ctx));
49
29
  }
50
30
  export function createSubTasks(tasks, opts) {
51
- opts = getOptions(opts);
52
31
  return async (ctx, task) => {
53
32
  if (isFunction(tasks)) {
54
33
  tasks = await tasks(ctx, task);
55
34
  }
56
- return task.newListr(tasks, opts);
35
+ return task.newListr(tasks, getOptions(opts));
57
36
  };
58
37
  }
59
38
  export function createTasksRunner(tasks, ctx) {
60
39
  return createTasks(tasks, ctx).run(ctx);
61
40
  }
62
- //# sourceMappingURL=createTasksRunner.js.map
@@ -15,4 +15,3 @@ export function getCommandMetadata(token) {
15
15
  ...opts
16
16
  };
17
17
  }
18
- //# sourceMappingURL=getCommandMetadata.js.map
@@ -1,9 +1,8 @@
1
1
  import { dirname, join } from "path";
2
- import readPkgUp from "read-pkg-up";
2
+ import { readPackageUpSync } from "read-pkg-up";
3
3
  export function getTemplateDirectory(cwd) {
4
- const { path } = readPkgUp.sync({
4
+ const { path } = readPackageUpSync({
5
5
  cwd: join(cwd, "..", "..")
6
6
  });
7
7
  return join(dirname(path), "templates");
8
8
  }
9
- //# sourceMappingURL=getTemplateDirectory.js.map
@@ -513,4 +513,3 @@ helpers.unique = function (array) {
513
513
  return arr.indexOf(item) === index;
514
514
  });
515
515
  };
516
- //# sourceMappingURL=array.js.map
@@ -58,4 +58,3 @@ helpers.iterate = function (collection, options) {
58
58
  }
59
59
  return options.inverse(this);
60
60
  };
61
- //# sourceMappingURL=collection.js.map
@@ -429,4 +429,3 @@ helpers.unlessLteq = function (a, b, options) {
429
429
  }
430
430
  return util.value(a > b, this, options);
431
431
  };
432
- //# sourceMappingURL=comparison.js.map
@@ -9,4 +9,3 @@ handlebars.registerHelper(object);
9
9
  handlebars.registerHelper(collection);
10
10
  handlebars.registerHelper(comparison);
11
11
  handlebars.registerHelper(switchHelpers);
12
- //# sourceMappingURL=index.js.map
@@ -234,4 +234,3 @@ helpers.pick = function (props, context, options) {
234
234
  * deprecated in a future release
235
235
  */
236
236
  helpers.stringify = helpers.JSONstringify;
237
- //# sourceMappingURL=object.js.map
@@ -8,4 +8,3 @@ helpers.case = function (value, options) {
8
8
  return options.fn(this);
9
9
  }
10
10
  };
11
- //# sourceMappingURL=switch.js.map
@@ -8,4 +8,3 @@ export * from "./mapCommanderArgs.js";
8
8
  export * from "./mapCommanderOptions.js";
9
9
  export * from "./parseOption.js";
10
10
  export * from "./resolveConfiguration.js";
11
- //# sourceMappingURL=index.js.map
@@ -3,4 +3,3 @@ export function isValidVersion(version) {
3
3
  version = version.replace(/[~>=<]/gi, "");
4
4
  return !!semver.valid(version);
5
5
  }
6
- //# sourceMappingURL=isValidVersion.js.map
@@ -1,7 +1,6 @@
1
1
  import { GlobalProviders, InjectorService } from "@tsed/di";
2
2
  import chalk from "chalk";
3
- // @ts-ignore
4
- import { figures } from "listr2";
3
+ import figures from "figures";
5
4
  import { CliFs } from "../services/CliFs.js";
6
5
  import { ProjectPackageJson } from "../services/ProjectPackageJson.js";
7
6
  const all = (promises) => Promise.all(promises);
@@ -38,4 +37,3 @@ export async function loadPlugins(injector) {
38
37
  });
39
38
  await all(promises);
40
39
  }
41
- //# sourceMappingURL=loadPlugins.js.map
@@ -11,4 +11,3 @@ export function logToCurl({ url, method, params, query, data, headers = {} }) {
11
11
  curl += Object.entries(headers).reduce((curlHeaders, [key, value]) => `${curlHeaders} -H '${key}: ${value}'`, "");
12
12
  return curl;
13
13
  }
14
- //# sourceMappingURL=logToCurl.js.map
@@ -33,4 +33,3 @@ export function mapCommanderArgs(args, commandArgs) {
33
33
  };
34
34
  }, {});
35
35
  }
36
- //# sourceMappingURL=mapCommanderArgs.js.map
@@ -1,6 +1,9 @@
1
- export function mapCommanderOptions(commands) {
1
+ export function mapCommanderOptions(commandName, commands) {
2
2
  const options = {};
3
3
  commands.forEach((command) => {
4
+ if (command.name() !== commandName) {
5
+ return;
6
+ }
4
7
  Object.entries(command.opts())
5
8
  .filter(([key]) => !key.startsWith("_") && !["commands", "options", "parent", "rawArgs", "args"].includes(key))
6
9
  .forEach(([key, value]) => {
@@ -9,4 +12,3 @@ export function mapCommanderOptions(commands) {
9
12
  });
10
13
  return options;
11
14
  }
12
- //# sourceMappingURL=mapCommanderOptions.js.map
@@ -21,4 +21,3 @@ export function parseOption(value, options) {
21
21
  }
22
22
  return value;
23
23
  }
24
- //# sourceMappingURL=parseOption.js.map
@@ -51,4 +51,3 @@ Command.prototype.helpInformation = function help() {
51
51
  .replace(/\[(\w+)]/gi, `[${chalk.cyan("$1")}]`) +
52
52
  "\n");
53
53
  };
54
- //# sourceMappingURL=patchCommander.js.map
@@ -10,4 +10,3 @@ export function insertAfter(fileContent, content, pattern) {
10
10
  }
11
11
  return lines.join("\n");
12
12
  }
13
- //# sourceMappingURL=insertAfter.js.map