@tsed/cli-core 6.0.0-alpha.1 → 6.0.0-alpha.10
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.
- package/lib/esm/CliCore.js +1 -1
- package/lib/esm/decorators/command.js +0 -1
- package/lib/esm/decorators/index.js +0 -1
- package/lib/esm/decorators/on.js +0 -1
- package/lib/esm/decorators/onAdd.js +0 -1
- package/lib/esm/decorators/onExec.js +0 -1
- package/lib/esm/decorators/onPostInstall.js +0 -1
- package/lib/esm/decorators/onPrompt.js +0 -1
- package/lib/esm/domains/CliError.js +0 -1
- package/lib/esm/domains/CommandStoreKeys.js +1 -2
- package/lib/esm/index.js +2 -3
- package/lib/esm/interfaces/CliDefaultOptions.js +0 -1
- package/lib/esm/interfaces/CommandMetadata.js +0 -1
- package/lib/esm/interfaces/CommandParameters.js +1 -2
- package/lib/esm/interfaces/CommandProvider.js +0 -1
- package/lib/esm/interfaces/PackageJson.js +0 -1
- package/lib/esm/interfaces/ProjectPreferences.js +1 -2
- package/lib/esm/interfaces/Tasks.js +1 -2
- package/lib/esm/interfaces/index.js +1 -1
- package/lib/esm/packageManagers/PackageManagersModule.js +4 -4
- package/lib/esm/packageManagers/index.js +0 -1
- package/lib/esm/packageManagers/supports/BaseManager.js +1 -1
- package/lib/esm/packageManagers/supports/BunManager.js +1 -1
- package/lib/esm/packageManagers/supports/NpmManager.js +1 -1
- package/lib/esm/packageManagers/supports/PNpmManager.js +1 -1
- package/lib/esm/packageManagers/supports/YarnBerryManager.js +2 -2
- package/lib/esm/packageManagers/supports/YarnManager.js +1 -1
- package/lib/esm/services/CliConfiguration.js +0 -1
- package/lib/esm/services/CliDockerComposeYaml.js +0 -1
- package/lib/esm/services/CliExeca.js +4 -4
- package/lib/esm/services/CliFs.js +4 -9
- package/lib/esm/services/CliHooks.js +0 -1
- package/lib/esm/services/CliHttpClient.js +1 -2
- package/lib/esm/services/CliHttpLogClient.js +0 -1
- package/lib/esm/services/CliLoadFile.js +0 -1
- package/lib/esm/services/CliPackageJson.js +1 -1
- package/lib/esm/services/CliPlugins.js +0 -1
- package/lib/esm/services/CliProxyAgent.js +0 -1
- package/lib/esm/services/CliRunScript.js +0 -1
- package/lib/esm/services/CliService.js +1 -2
- package/lib/esm/services/CliYaml.js +0 -1
- package/lib/esm/services/NpmRegistryClient.js +0 -1
- package/lib/esm/services/ProjectPackageJson.js +3 -3
- package/lib/esm/services/Renderer.js +3 -4
- package/lib/esm/services/index.js +0 -1
- package/lib/esm/utils/coerce.js +0 -1
- package/lib/esm/utils/createInjector.js +0 -1
- package/lib/esm/utils/createTasksRunner.js +17 -39
- package/lib/esm/utils/getCommandMetadata.js +1 -2
- package/lib/esm/utils/getTemplateDirectory.js +2 -3
- package/lib/esm/utils/hbs/array.js +0 -1
- package/lib/esm/utils/hbs/collection.js +0 -1
- package/lib/esm/utils/hbs/comparison.js +0 -1
- package/lib/esm/utils/hbs/index.js +0 -1
- package/lib/esm/utils/hbs/object.js +0 -1
- package/lib/esm/utils/hbs/switch.js +0 -1
- package/lib/esm/utils/index.js +0 -1
- package/lib/esm/utils/isValidVersion.js +0 -1
- package/lib/esm/utils/loadPlugins.js +2 -4
- package/lib/esm/utils/logToCurl.js +0 -1
- package/lib/esm/utils/mapCommanderArgs.js +1 -2
- package/lib/esm/utils/mapCommanderOptions.js +0 -1
- package/lib/esm/utils/parseOption.js +1 -1
- package/lib/esm/utils/patchCommander.js +0 -1
- package/lib/esm/utils/renderer/insertAfter.js +0 -1
- package/lib/esm/utils/renderer/insertImport.js +0 -1
- package/lib/esm/utils/resolveConfiguration.js +0 -1
- package/lib/esm/utils/streamToObservable.js +0 -1
- package/lib/types/decorators/command.d.ts +1 -1
- package/lib/types/index.d.ts +2 -2
- package/lib/types/interfaces/CommandMetadata.d.ts +1 -1
- package/lib/types/interfaces/CommandProvider.d.ts +2 -2
- package/lib/types/interfaces/PackageJson.d.ts +2 -0
- package/lib/types/interfaces/Tasks.d.ts +2 -2
- package/lib/types/interfaces/index.d.ts +2 -2
- package/lib/types/packageManagers/PackageManagersModule.d.ts +3 -4
- package/lib/types/packageManagers/supports/BaseManager.d.ts +5 -7
- package/lib/types/packageManagers/supports/BunManager.d.ts +3 -3
- package/lib/types/packageManagers/supports/NpmManager.d.ts +1 -1
- package/lib/types/packageManagers/supports/PNpmManager.d.ts +1 -1
- package/lib/types/packageManagers/supports/YarnBerryManager.d.ts +3 -6
- package/lib/types/packageManagers/supports/YarnManager.d.ts +3 -3
- package/lib/types/services/CliDockerComposeYaml.d.ts +1 -1
- package/lib/types/services/CliExeca.d.ts +5 -22
- package/lib/types/services/CliFs.d.ts +5 -8
- package/lib/types/services/CliHttpClient.d.ts +1 -1
- package/lib/types/services/CliLoadFile.d.ts +1 -1
- package/lib/types/services/CliPackageJson.d.ts +1 -1
- package/lib/types/services/CliPlugins.d.ts +1 -1
- package/lib/types/services/CliService.d.ts +1 -1
- package/lib/types/services/CliYaml.d.ts +1 -1
- package/lib/types/services/NpmRegistryClient.d.ts +1 -1
- package/lib/types/services/ProjectPackageJson.d.ts +2 -2
- package/lib/types/services/Renderer.d.ts +1 -1
- package/lib/types/utils/createInjector.d.ts +1 -1
- package/lib/types/utils/createTasksRunner.d.ts +3 -3
- package/lib/types/utils/getCommandMetadata.d.ts +1 -1
- package/lib/types/utils/mapCommanderArgs.d.ts +1 -1
- package/lib/types/utils/mapCommanderOptions.d.ts +2 -2
- package/package.json +42 -47
- package/lib/esm/CliCore.js.map +0 -1
- package/lib/esm/decorators/command.js.map +0 -1
- package/lib/esm/decorators/index.js.map +0 -1
- package/lib/esm/decorators/on.js.map +0 -1
- package/lib/esm/decorators/onAdd.js.map +0 -1
- package/lib/esm/decorators/onExec.js.map +0 -1
- package/lib/esm/decorators/onPostInstall.js.map +0 -1
- package/lib/esm/decorators/onPrompt.js.map +0 -1
- package/lib/esm/domains/CliError.js.map +0 -1
- package/lib/esm/domains/CommandStoreKeys.js.map +0 -1
- package/lib/esm/index.js.map +0 -1
- package/lib/esm/interfaces/CliDefaultOptions.js.map +0 -1
- package/lib/esm/interfaces/CommandMetadata.js.map +0 -1
- package/lib/esm/interfaces/CommandParameters.js.map +0 -1
- package/lib/esm/interfaces/CommandProvider.js.map +0 -1
- package/lib/esm/interfaces/PackageJson.js.map +0 -1
- package/lib/esm/interfaces/ProjectPreferences.js.map +0 -1
- package/lib/esm/interfaces/Tasks.js.map +0 -1
- package/lib/esm/interfaces/index.js.map +0 -1
- package/lib/esm/packageManagers/PackageManagersModule.js.map +0 -1
- package/lib/esm/packageManagers/index.js.map +0 -1
- package/lib/esm/packageManagers/supports/BaseManager.js.map +0 -1
- package/lib/esm/packageManagers/supports/BunManager.js.map +0 -1
- package/lib/esm/packageManagers/supports/NpmManager.js.map +0 -1
- package/lib/esm/packageManagers/supports/PNpmManager.js.map +0 -1
- package/lib/esm/packageManagers/supports/YarnBerryManager.js.map +0 -1
- package/lib/esm/packageManagers/supports/YarnManager.js.map +0 -1
- package/lib/esm/services/CliConfiguration.js.map +0 -1
- package/lib/esm/services/CliDockerComposeYaml.js.map +0 -1
- package/lib/esm/services/CliExeca.js.map +0 -1
- package/lib/esm/services/CliFs.js.map +0 -1
- package/lib/esm/services/CliHooks.js.map +0 -1
- package/lib/esm/services/CliHttpClient.js.map +0 -1
- package/lib/esm/services/CliHttpLogClient.js.map +0 -1
- package/lib/esm/services/CliLoadFile.js.map +0 -1
- package/lib/esm/services/CliPackageJson.js.map +0 -1
- package/lib/esm/services/CliPlugins.js.map +0 -1
- package/lib/esm/services/CliProxyAgent.js.map +0 -1
- package/lib/esm/services/CliRunScript.js.map +0 -1
- package/lib/esm/services/CliService.js.map +0 -1
- package/lib/esm/services/CliYaml.js.map +0 -1
- package/lib/esm/services/NpmRegistryClient.js.map +0 -1
- package/lib/esm/services/ProjectPackageJson.js.map +0 -1
- package/lib/esm/services/Renderer.js.map +0 -1
- package/lib/esm/services/index.js.map +0 -1
- package/lib/esm/utils/coerce.js.map +0 -1
- package/lib/esm/utils/createInjector.js.map +0 -1
- package/lib/esm/utils/createTasksRunner.js.map +0 -1
- package/lib/esm/utils/getCommandMetadata.js.map +0 -1
- package/lib/esm/utils/getTemplateDirectory.js.map +0 -1
- package/lib/esm/utils/hbs/array.js.map +0 -1
- package/lib/esm/utils/hbs/collection.js.map +0 -1
- package/lib/esm/utils/hbs/comparison.js.map +0 -1
- package/lib/esm/utils/hbs/index.js.map +0 -1
- package/lib/esm/utils/hbs/object.js.map +0 -1
- package/lib/esm/utils/hbs/switch.js.map +0 -1
- package/lib/esm/utils/index.js.map +0 -1
- package/lib/esm/utils/isValidVersion.js.map +0 -1
- package/lib/esm/utils/loadPlugins.js.map +0 -1
- package/lib/esm/utils/logToCurl.js.map +0 -1
- package/lib/esm/utils/mapCommanderArgs.js.map +0 -1
- package/lib/esm/utils/mapCommanderOptions.js.map +0 -1
- package/lib/esm/utils/parseOption.js.map +0 -1
- package/lib/esm/utils/patchCommander.js.map +0 -1
- package/lib/esm/utils/renderer/insertAfter.js.map +0 -1
- package/lib/esm/utils/renderer/insertImport.js.map +0 -1
- package/lib/esm/utils/resolveConfiguration.js.map +0 -1
- package/lib/esm/utils/streamToObservable.js.map +0 -1
package/lib/esm/CliCore.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
var CliCore_1;
|
|
2
2
|
import { __decorate, __metadata } from "tslib";
|
|
3
|
+
import { Type } from "@tsed/core";
|
|
3
4
|
import { Inject, InjectorService, Module } from "@tsed/di";
|
|
4
5
|
import chalk from "chalk";
|
|
5
6
|
import { Command } from "commander";
|
|
@@ -102,4 +103,3 @@ CliCore = CliCore_1 = __decorate([
|
|
|
102
103
|
})
|
|
103
104
|
], CliCore);
|
|
104
105
|
export { CliCore };
|
|
105
|
-
//# sourceMappingURL=CliCore.js.map
|
package/lib/esm/decorators/on.js
CHANGED
|
@@ -5,5 +5,4 @@ export var CommandStoreKeys;
|
|
|
5
5
|
CommandStoreKeys["EXEC_HOOKS"] = "$onExec";
|
|
6
6
|
CommandStoreKeys["POST_INSTALL_HOOKS"] = "$onPostInstall";
|
|
7
7
|
CommandStoreKeys["PROMPT_HOOKS"] = "$onPrompt";
|
|
8
|
-
})(CommandStoreKeys
|
|
9
|
-
//# sourceMappingURL=CommandStoreKeys.js.map
|
|
8
|
+
})(CommandStoreKeys || (CommandStoreKeys = {}));
|
package/lib/esm/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import "./utils/patchCommander.js";
|
|
1
2
|
import Inquirer from "inquirer";
|
|
2
3
|
export * from "./CliCore.js";
|
|
3
4
|
export * from "./decorators/index.js";
|
|
@@ -6,9 +7,7 @@ export * from "./packageManagers/index.js";
|
|
|
6
7
|
export * from "./services/index.js";
|
|
7
8
|
export * from "./utils/index.js";
|
|
8
9
|
export * from "@tsed/core";
|
|
9
|
-
export
|
|
10
|
+
export * from "@tsed/di";
|
|
10
11
|
export * from "@tsed/logger";
|
|
11
12
|
export * from "@tsed/normalize-path";
|
|
12
13
|
export { Inquirer };
|
|
13
|
-
import "./utils/patchCommander";
|
|
14
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
//# sourceMappingURL=CommandParameters.js.map
|
|
1
|
+
import { Type } from "@tsed/core";
|
|
@@ -4,5 +4,4 @@ export var PackageManager;
|
|
|
4
4
|
PackageManager["YARN_BERRY"] = "yarn_berry";
|
|
5
5
|
PackageManager["NPM"] = "npm";
|
|
6
6
|
PackageManager["PNPM"] = "pnpm";
|
|
7
|
-
})(PackageManager
|
|
8
|
-
//# sourceMappingURL=ProjectPreferences.js.map
|
|
7
|
+
})(PackageManager || (PackageManager = {}));
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
//# sourceMappingURL=Tasks.js.map
|
|
1
|
+
import {} from "listr2";
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Type } from "@tsed/core";
|
|
1
2
|
export * from "./CliDefaultOptions.js";
|
|
2
3
|
export * from "./CommandMetadata.js";
|
|
3
4
|
export * from "./CommandParameters.js";
|
|
@@ -5,4 +6,3 @@ export * from "./CommandProvider.js";
|
|
|
5
6
|
export * from "./PackageJson.js";
|
|
6
7
|
export * from "./ProjectPreferences.js";
|
|
7
8
|
export * from "./Tasks.js";
|
|
8
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -4,6 +4,7 @@ import { EMPTY, throwError } from "rxjs";
|
|
|
4
4
|
import { catchError } from "rxjs/operators";
|
|
5
5
|
import { ProjectPackageJson } from "../services/ProjectPackageJson.js";
|
|
6
6
|
import { isValidVersion } from "../utils/isValidVersion.js";
|
|
7
|
+
import { BaseManager } from "./supports/BaseManager.js";
|
|
7
8
|
import { BunManager } from "./supports/BunManager.js";
|
|
8
9
|
import { NpmManager } from "./supports/NpmManager.js";
|
|
9
10
|
import { PNpmManager } from "./supports/PNpmManager.js";
|
|
@@ -67,17 +68,17 @@ let PackageManagersModule = class PackageManagersModule {
|
|
|
67
68
|
{
|
|
68
69
|
title: `Installing dependencies using ${packageManager.name}`,
|
|
69
70
|
skip: () => !this.projectPackageJson.reinstall,
|
|
70
|
-
task: () => packageManager.install(options).pipe(errorPipe())
|
|
71
|
+
task: () => packageManager.install(options) // .pipe(errorPipe())
|
|
71
72
|
},
|
|
72
73
|
{
|
|
73
74
|
title: `Add dependencies using ${packageManager.name}`,
|
|
74
75
|
skip: () => !deps.length,
|
|
75
|
-
task: () => packageManager.add(deps, options)
|
|
76
|
+
task: () => packageManager.add(deps, options) //.pipe(errorPipe())
|
|
76
77
|
},
|
|
77
78
|
{
|
|
78
79
|
title: `Add devDependencies using ${packageManager.name}`,
|
|
79
80
|
skip: () => !devDeps.length,
|
|
80
|
-
task: () => packageManager.addDev(devDeps, options)
|
|
81
|
+
task: () => packageManager.addDev(devDeps, options) //.pipe(errorPipe())
|
|
81
82
|
},
|
|
82
83
|
{
|
|
83
84
|
title: "Refresh",
|
|
@@ -128,4 +129,3 @@ PackageManagersModule = __decorate([
|
|
|
128
129
|
__metadata("design:paramtypes", [Array])
|
|
129
130
|
], PackageManagersModule);
|
|
130
131
|
export { PackageManagersModule };
|
|
131
|
-
//# sourceMappingURL=PackageManagersModule.js.map
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
2
|
import { Inject } from "@tsed/di";
|
|
3
|
+
import { Observable } from "rxjs";
|
|
3
4
|
import { CliExeca } from "../../services/CliExeca.js";
|
|
4
5
|
export class BaseManager {
|
|
5
6
|
constructor() {
|
|
@@ -26,4 +27,3 @@ __decorate([
|
|
|
26
27
|
Inject(CliExeca),
|
|
27
28
|
__metadata("design:type", CliExeca)
|
|
28
29
|
], BaseManager.prototype, "cliExeca", void 0);
|
|
29
|
-
//# sourceMappingURL=BaseManager.js.map
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Injectable } from "@tsed/di";
|
|
3
|
+
import { Observable } from "rxjs";
|
|
3
4
|
import { BaseManager } from "./BaseManager.js";
|
|
4
5
|
let BunManager = class BunManager extends BaseManager {
|
|
5
6
|
constructor() {
|
|
@@ -23,4 +24,3 @@ BunManager = __decorate([
|
|
|
23
24
|
})
|
|
24
25
|
], BunManager);
|
|
25
26
|
export { BunManager };
|
|
26
|
-
//# sourceMappingURL=BunManager.js.map
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Injectable } from "@tsed/di";
|
|
3
|
+
import { Observable } from "rxjs";
|
|
3
4
|
import { BaseManager } from "./BaseManager.js";
|
|
4
5
|
let NpmManager = class NpmManager extends BaseManager {
|
|
5
6
|
constructor() {
|
|
@@ -23,4 +24,3 @@ NpmManager = __decorate([
|
|
|
23
24
|
})
|
|
24
25
|
], NpmManager);
|
|
25
26
|
export { NpmManager };
|
|
26
|
-
//# sourceMappingURL=NpmManager.js.map
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Injectable } from "@tsed/di";
|
|
3
|
+
import { Observable } from "rxjs";
|
|
3
4
|
import { BaseManager } from "./BaseManager.js";
|
|
4
5
|
let PNpmManager = class PNpmManager extends BaseManager {
|
|
5
6
|
constructor() {
|
|
@@ -23,4 +24,3 @@ PNpmManager = __decorate([
|
|
|
23
24
|
})
|
|
24
25
|
], PNpmManager);
|
|
25
26
|
export { PNpmManager };
|
|
26
|
-
//# sourceMappingURL=PNpmManager.js.map
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
2
|
import { Inject, Injectable } from "@tsed/di";
|
|
3
3
|
import { join } from "path";
|
|
4
|
+
import { Observable } from "rxjs";
|
|
4
5
|
import { CliYaml } from "../../services/CliYaml.js";
|
|
5
6
|
import { BaseManager } from "./BaseManager.js";
|
|
6
7
|
let YarnBerryManager = class YarnBerryManager extends BaseManager {
|
|
@@ -13,7 +14,7 @@ let YarnBerryManager = class YarnBerryManager extends BaseManager {
|
|
|
13
14
|
// init yarn v1
|
|
14
15
|
this.install(options);
|
|
15
16
|
// then switch write file
|
|
16
|
-
await this.cliYaml.write(join(options.cwd, ".yarnrc.yml"), {
|
|
17
|
+
await this.cliYaml.write(join(String(options.cwd), ".yarnrc.yml"), {
|
|
17
18
|
nodeLinker: "node-modules"
|
|
18
19
|
});
|
|
19
20
|
// then switch to berry
|
|
@@ -39,4 +40,3 @@ YarnBerryManager = __decorate([
|
|
|
39
40
|
})
|
|
40
41
|
], YarnBerryManager);
|
|
41
42
|
export { YarnBerryManager };
|
|
42
|
-
//# sourceMappingURL=YarnBerryManager.js.map
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Injectable } from "@tsed/di";
|
|
3
|
+
import { Observable } from "rxjs";
|
|
3
4
|
import { BaseManager } from "./BaseManager.js";
|
|
4
5
|
let YarnManager = class YarnManager extends BaseManager {
|
|
5
6
|
constructor() {
|
|
@@ -23,4 +24,3 @@ YarnManager = __decorate([
|
|
|
23
24
|
})
|
|
24
25
|
], YarnManager);
|
|
25
26
|
export { YarnManager };
|
|
26
|
-
//# sourceMappingURL=YarnManager.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.
|
|
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.
|
|
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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Injectable } from "@tsed/di";
|
|
3
3
|
import { normalizePath } from "@tsed/normalize-path";
|
|
4
|
-
import Fs from "fs-extra";
|
|
4
|
+
import Fs, {} from "fs-extra";
|
|
5
5
|
import { join } from "path";
|
|
6
6
|
let CliFs = class CliFs {
|
|
7
7
|
constructor() {
|
|
@@ -48,16 +48,15 @@ let CliFs = class CliFs {
|
|
|
48
48
|
async importModule(mod, root = process.cwd()) {
|
|
49
49
|
try {
|
|
50
50
|
if (process.env.NODE_ENV === "development") {
|
|
51
|
-
if (isCommonjs()) {
|
|
52
|
-
return require(mod);
|
|
53
|
-
}
|
|
54
51
|
return await import(mod);
|
|
55
52
|
}
|
|
56
53
|
}
|
|
57
54
|
catch (er) { }
|
|
58
55
|
const path = this.findUpFile(root, join("node_modules", mod));
|
|
59
56
|
if (path) {
|
|
60
|
-
|
|
57
|
+
const pkg = await this.readJson(join(path, "package.json"));
|
|
58
|
+
const file = pkg.exports?.["."]?.import || pkg.exports?.["."]?.default || pkg.exports?.["."] || pkg.module || pkg.main;
|
|
59
|
+
return import(join(path, file));
|
|
61
60
|
}
|
|
62
61
|
return import(mod);
|
|
63
62
|
}
|
|
@@ -66,7 +65,3 @@ CliFs = __decorate([
|
|
|
66
65
|
Injectable()
|
|
67
66
|
], CliFs);
|
|
68
67
|
export { CliFs };
|
|
69
|
-
function isCommonjs() {
|
|
70
|
-
return typeof module !== "undefined" && typeof exports !== "undefined";
|
|
71
|
-
}
|
|
72
|
-
//# sourceMappingURL=CliFs.js.map
|
|
@@ -2,7 +2,7 @@ var CliHttpClient_1;
|
|
|
2
2
|
import { __decorate, __metadata } from "tslib";
|
|
3
3
|
import { cleanObject } from "@tsed/core";
|
|
4
4
|
import { Inject, Injectable } from "@tsed/di";
|
|
5
|
-
import axios from "axios";
|
|
5
|
+
import axios, {} from "axios";
|
|
6
6
|
import { stringify } from "querystring";
|
|
7
7
|
import { URL } from "url";
|
|
8
8
|
import { CliHttpLogClient } from "./CliHttpLogClient.js";
|
|
@@ -101,4 +101,3 @@ CliHttpClient = CliHttpClient_1 = __decorate([
|
|
|
101
101
|
Injectable()
|
|
102
102
|
], CliHttpClient);
|
|
103
103
|
export { CliHttpClient };
|
|
104
|
-
//# sourceMappingURL=CliHttpClient.js.map
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Configuration, Inject, registerProvider } from "@tsed/di";
|
|
2
|
+
import {} from "../interfaces/PackageJson.js";
|
|
2
3
|
export function CliPackageJson() {
|
|
3
4
|
return Inject(CliPackageJson);
|
|
4
5
|
}
|
|
@@ -9,4 +10,3 @@ registerProvider({
|
|
|
9
10
|
return configuration.pkg || {};
|
|
10
11
|
}
|
|
11
12
|
});
|
|
12
|
-
//# sourceMappingURL=CliPackageJson.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
2
|
import { classOf } from "@tsed/core";
|
|
3
|
-
import { Constant, DIContext, getContext, Inject, Injectable, InjectorService, runInContext } from "@tsed/di";
|
|
3
|
+
import { Constant, DIContext, getContext, Inject, Injectable, InjectorService, Provider, runInContext } from "@tsed/di";
|
|
4
4
|
import { Argument, Command } from "commander";
|
|
5
5
|
import Inquirer from "inquirer";
|
|
6
6
|
// @ts-ignore
|
|
@@ -277,4 +277,3 @@ CliService = __decorate([
|
|
|
277
277
|
Injectable()
|
|
278
278
|
], CliService);
|
|
279
279
|
export { CliService };
|
|
280
|
-
//# sourceMappingURL=CliService.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
|
|
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) {
|
|
@@ -172,6 +172,7 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
172
172
|
this.raw = {
|
|
173
173
|
...originalPkg,
|
|
174
174
|
...this.raw,
|
|
175
|
+
type: "module",
|
|
175
176
|
scripts: {
|
|
176
177
|
...(originalPkg.scripts || {}),
|
|
177
178
|
...(this.raw.scripts || {})
|
|
@@ -240,7 +241,7 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
240
241
|
const pkgPath = join(String(cwd), "package.json");
|
|
241
242
|
const fileExists = this.fs.exists(pkgPath);
|
|
242
243
|
if (!disableReadUpPkg && !fileExists) {
|
|
243
|
-
const result =
|
|
244
|
+
const result = readPackageUpSync({
|
|
244
245
|
cwd
|
|
245
246
|
});
|
|
246
247
|
if (result && result.path) {
|
|
@@ -274,4 +275,3 @@ ProjectPackageJson = __decorate([
|
|
|
274
275
|
__metadata("design:paramtypes", [Object, CliFs])
|
|
275
276
|
], ProjectPackageJson);
|
|
276
277
|
export { ProjectPackageJson };
|
|
277
|
-
//# sourceMappingURL=ProjectPackageJson.js.map
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
|
-
import "../utils/hbs/index";
|
|
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
|
package/lib/esm/utils/coerce.js
CHANGED
|
@@ -1,62 +1,40 @@
|
|
|
1
1
|
// @ts-ignore
|
|
2
2
|
import { isFunction } from "@tsed/core";
|
|
3
|
-
import { Listr,
|
|
3
|
+
import { DefaultRenderer, Listr, ListrLogger, VerboseRenderer } from "listr2";
|
|
4
4
|
import { getLogger } from "./createInjector.js";
|
|
5
|
-
class CustomLogger extends
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
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
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Store } from "@tsed/core";
|
|
1
|
+
import { Store, Type } from "@tsed/core";
|
|
2
2
|
import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
|
|
3
3
|
export function getCommandMetadata(token) {
|
|
4
4
|
const { name, alias, args = {}, allowUnknownOption, description, options = {}, enableFeatures, disableReadUpPkg, bindLogger = true, ...opts } = Store.from(token)?.get(CommandStoreKeys.COMMAND);
|
|
@@ -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
|
|
2
|
+
import { readPackageUpSync } from "read-pkg-up";
|
|
3
3
|
export function getTemplateDirectory(cwd) {
|
|
4
|
-
const { path } =
|
|
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
|