@tsed/cli-core 4.6.6 → 5.0.0-rc.2
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/cjs/index.js +5 -4
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/packageManagers/PackageManagersModule.js +136 -0
- package/lib/cjs/packageManagers/PackageManagersModule.js.map +1 -0
- package/lib/cjs/packageManagers/index.js +9 -0
- package/lib/cjs/packageManagers/index.js.map +1 -0
- package/lib/cjs/{services/packageManagers → packageManagers/supports}/BaseManager.js +1 -4
- package/lib/cjs/packageManagers/supports/BaseManager.js.map +1 -0
- package/lib/cjs/packageManagers/supports/BunManager.js +26 -0
- package/lib/cjs/packageManagers/supports/BunManager.js.map +1 -0
- package/lib/cjs/{services/packageManagers → packageManagers/supports}/NpmManager.js.map +1 -1
- package/lib/cjs/{services/packageManagers → packageManagers/supports}/PNpmManager.js.map +1 -1
- package/lib/cjs/{services/packageManagers → packageManagers/supports}/YarnBerryManager.js +1 -1
- package/lib/cjs/{services/packageManagers → packageManagers/supports}/YarnBerryManager.js.map +1 -1
- package/lib/cjs/{services/packageManagers → packageManagers/supports}/YarnManager.js.map +1 -1
- package/lib/cjs/services/CliPlugins.js +11 -5
- package/lib/cjs/services/CliPlugins.js.map +1 -1
- package/lib/cjs/services/CliService.js +7 -1
- package/lib/cjs/services/CliService.js.map +1 -1
- package/lib/cjs/services/ProjectPackageJson.js +3 -119
- package/lib/cjs/services/ProjectPackageJson.js.map +1 -1
- package/lib/cjs/services/Renderer.js +17 -0
- package/lib/cjs/services/Renderer.js.map +1 -1
- package/lib/cjs/services/index.js +0 -4
- package/lib/cjs/services/index.js.map +1 -1
- package/lib/esm/index.js +5 -4
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/packageManagers/PackageManagersModule.js +133 -0
- package/lib/esm/packageManagers/PackageManagersModule.js.map +1 -0
- package/lib/esm/packageManagers/index.js +6 -0
- package/lib/esm/packageManagers/index.js.map +1 -0
- package/lib/esm/{services/packageManagers → packageManagers/supports}/BaseManager.js +1 -4
- package/lib/esm/{services/packageManagers → packageManagers/supports}/BaseManager.js.map +1 -1
- package/lib/esm/packageManagers/supports/BunManager.js +23 -0
- package/lib/esm/packageManagers/supports/BunManager.js.map +1 -0
- package/lib/esm/{services/packageManagers → packageManagers/supports}/NpmManager.js.map +1 -1
- package/lib/esm/{services/packageManagers → packageManagers/supports}/PNpmManager.js.map +1 -1
- package/lib/esm/{services/packageManagers → packageManagers/supports}/YarnBerryManager.js +1 -1
- package/lib/esm/packageManagers/supports/YarnBerryManager.js.map +1 -0
- package/lib/esm/{services/packageManagers → packageManagers/supports}/YarnManager.js.map +1 -1
- package/lib/esm/services/CliPlugins.js +11 -5
- package/lib/esm/services/CliPlugins.js.map +1 -1
- package/lib/esm/services/CliService.js +7 -1
- package/lib/esm/services/CliService.js.map +1 -1
- package/lib/esm/services/ProjectPackageJson.js +4 -120
- package/lib/esm/services/ProjectPackageJson.js.map +1 -1
- package/lib/esm/services/Renderer.js +18 -1
- package/lib/esm/services/Renderer.js.map +1 -1
- package/lib/esm/services/index.js +0 -4
- package/lib/esm/services/index.js.map +1 -1
- package/lib/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/index.d.ts +5 -4
- package/lib/types/packageManagers/PackageManagersModule.d.ts +34 -0
- package/lib/types/packageManagers/index.d.ts +5 -0
- package/lib/types/{services/packageManagers → packageManagers/supports}/BaseManager.d.ts +2 -3
- package/lib/types/packageManagers/supports/BunManager.d.ts +12 -0
- package/lib/types/{services/packageManagers → packageManagers/supports}/YarnBerryManager.d.ts +1 -1
- package/lib/types/services/CliPlugins.d.ts +1 -0
- package/lib/types/services/CliService.d.ts +2 -0
- package/lib/types/services/ProjectPackageJson.d.ts +2 -32
- package/lib/types/services/Renderer.d.ts +2 -0
- package/lib/types/services/index.d.ts +0 -4
- package/package.json +8 -5
- package/lib/cjs/services/packageManagers/BaseManager.js.map +0 -1
- package/lib/esm/services/packageManagers/YarnBerryManager.js.map +0 -1
- /package/lib/cjs/{services/packageManagers → packageManagers/supports}/NpmManager.js +0 -0
- /package/lib/cjs/{services/packageManagers → packageManagers/supports}/PNpmManager.js +0 -0
- /package/lib/cjs/{services/packageManagers → packageManagers/supports}/YarnManager.js +0 -0
- /package/lib/esm/{services/packageManagers → packageManagers/supports}/NpmManager.js +0 -0
- /package/lib/esm/{services/packageManagers → packageManagers/supports}/PNpmManager.js +0 -0
- /package/lib/esm/{services/packageManagers → packageManagers/supports}/YarnManager.js +0 -0
- /package/lib/types/{services/packageManagers → packageManagers/supports}/NpmManager.d.ts +0 -0
- /package/lib/types/{services/packageManagers → packageManagers/supports}/PNpmManager.d.ts +0 -0
- /package/lib/types/{services/packageManagers → packageManagers/supports}/YarnManager.d.ts +0 -0
package/lib/cjs/index.js
CHANGED
|
@@ -22,10 +22,11 @@ Object.defineProperty(exports, "OverrideProvider", { enumerable: true, get: func
|
|
|
22
22
|
Object.defineProperty(exports, "InjectorService", { enumerable: true, get: function () { return di_1.InjectorService; } });
|
|
23
23
|
Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return di_1.Container; } });
|
|
24
24
|
Object.defineProperty(exports, "DITest", { enumerable: true, get: function () { return di_1.DITest; } });
|
|
25
|
-
tslib_1.__exportStar(require("./interfaces"), exports);
|
|
26
|
-
tslib_1.__exportStar(require("./decorators"), exports);
|
|
27
|
-
tslib_1.__exportStar(require("./services"), exports);
|
|
28
|
-
tslib_1.__exportStar(require("./
|
|
25
|
+
tslib_1.__exportStar(require("./interfaces/index"), exports);
|
|
26
|
+
tslib_1.__exportStar(require("./decorators/index"), exports);
|
|
27
|
+
tslib_1.__exportStar(require("./services/index"), exports);
|
|
28
|
+
tslib_1.__exportStar(require("./packageManagers/index"), exports);
|
|
29
|
+
tslib_1.__exportStar(require("./utils/index"), exports);
|
|
29
30
|
tslib_1.__exportStar(require("./CliCore"), exports);
|
|
30
31
|
require("./utils/patchCommander");
|
|
31
32
|
//# sourceMappingURL=index.js.map
|
package/lib/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,gEAAgC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,gEAAgC;AA8BxB,mBA9BD,kBAAQ,CA8BC;AA7BhB,qDAA2B;AAC3B,uDAA6B;AAC7B,+DAAqC;AACrC,+BAmBkB;AAlBhB,4FAAA,MAAM,OAAA;AACN,sGAAA,gBAAgB,OAAA;AAChB,gGAAA,UAAU,OAAA;AACV,8FAAA,QAAQ,OAAA;AACR,2FAAA,KAAK,OAAA;AACL,mGAAA,aAAa,OAAA;AACb,qGAAA,eAAe,OAAA;AAGf,4FAAA,MAAM,OAAA;AACN,0FAAA,IAAI,OAAA;AACJ,6FAAA,OAAO,OAAA;AACP,sGAAA,gBAAgB,OAAA;AAChB,qGAAA,eAAe,OAAA;AAGf,+FAAA,SAAS,OAAA;AACT,4FAAA,MAAM,OAAA;AAER,6DAAmC;AACnC,6DAAmC;AACnC,2DAAiC;AACjC,kEAAwC;AACxC,wDAA8B;AAC9B,oDAA0B;AAG1B,kCAAgC"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PackageManagersModule = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const di_1 = require("@tsed/di");
|
|
6
|
+
const YarnManager_1 = require("./supports/YarnManager");
|
|
7
|
+
const YarnBerryManager_1 = require("./supports/YarnBerryManager");
|
|
8
|
+
const NpmManager_1 = require("./supports/NpmManager");
|
|
9
|
+
const PNpmManager_1 = require("./supports/PNpmManager");
|
|
10
|
+
const operators_1 = require("rxjs/operators");
|
|
11
|
+
const rxjs_1 = require("rxjs");
|
|
12
|
+
const ProjectPackageJson_1 = require("../services/ProjectPackageJson");
|
|
13
|
+
const isValidVersion_1 = require("../utils/isValidVersion");
|
|
14
|
+
const BunManager_1 = require("./supports/BunManager");
|
|
15
|
+
function mapPackagesWithInvalidVersion(deps) {
|
|
16
|
+
const toString = (info) => {
|
|
17
|
+
return info[1] === "latest" ? info[0] : info.join("@");
|
|
18
|
+
};
|
|
19
|
+
return Object.entries(deps)
|
|
20
|
+
.filter(([, version]) => !(0, isValidVersion_1.isValidVersion)(version))
|
|
21
|
+
.map(toString);
|
|
22
|
+
}
|
|
23
|
+
let PackageManagersModule = class PackageManagersModule {
|
|
24
|
+
packageManagers;
|
|
25
|
+
projectPackageJson;
|
|
26
|
+
constructor(packageManagers) {
|
|
27
|
+
this.packageManagers = packageManagers;
|
|
28
|
+
this.packageManagers = packageManagers.filter((manager) => manager.has());
|
|
29
|
+
}
|
|
30
|
+
init(options = {}) {
|
|
31
|
+
const packageManager = this.get(options.packageManager);
|
|
32
|
+
options.packageManager = packageManager.name;
|
|
33
|
+
options = {
|
|
34
|
+
...options,
|
|
35
|
+
cwd: this.projectPackageJson.dir,
|
|
36
|
+
env: {
|
|
37
|
+
...process.env,
|
|
38
|
+
GH_TOKEN: this.projectPackageJson.GH_TOKEN
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
this.projectPackageJson.write();
|
|
42
|
+
this.projectPackageJson.rewrite = true;
|
|
43
|
+
return packageManager.init(options);
|
|
44
|
+
}
|
|
45
|
+
install(options = {}) {
|
|
46
|
+
const packageManager = this.get(options.packageManager);
|
|
47
|
+
options.packageManager = packageManager.name;
|
|
48
|
+
const devDeps = mapPackagesWithInvalidVersion(this.projectPackageJson.devDependencies);
|
|
49
|
+
const deps = mapPackagesWithInvalidVersion(this.projectPackageJson.dependencies);
|
|
50
|
+
options = {
|
|
51
|
+
...options,
|
|
52
|
+
cwd: this.projectPackageJson.dir,
|
|
53
|
+
env: {
|
|
54
|
+
...process.env,
|
|
55
|
+
GH_TOKEN: this.projectPackageJson.GH_TOKEN
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
const errorPipe = () => (0, operators_1.catchError)((error) => {
|
|
59
|
+
if (error.stderr.startsWith("error Your lockfile needs to be updated")) {
|
|
60
|
+
return (0, rxjs_1.throwError)(new Error(`yarn.lock file is outdated. Run ${packageManager.name}, commit the updated lockfile and try again.`));
|
|
61
|
+
}
|
|
62
|
+
return (0, rxjs_1.throwError)(error);
|
|
63
|
+
});
|
|
64
|
+
return [
|
|
65
|
+
{
|
|
66
|
+
title: "Write package.json",
|
|
67
|
+
enabled: () => this.projectPackageJson.rewrite,
|
|
68
|
+
task: () => {
|
|
69
|
+
this.projectPackageJson.write();
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
title: `Installing dependencies using ${packageManager.name}`,
|
|
74
|
+
skip: () => !this.projectPackageJson.reinstall,
|
|
75
|
+
task: () => packageManager.install(options).pipe(errorPipe())
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
title: `Add dependencies using ${packageManager.name}`,
|
|
79
|
+
skip: () => !deps.length,
|
|
80
|
+
task: () => packageManager.add(deps, options).pipe(errorPipe())
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
title: `Add devDependencies using ${packageManager.name}`,
|
|
84
|
+
skip: () => !devDeps.length,
|
|
85
|
+
task: () => packageManager.addDev(devDeps, options).pipe(errorPipe())
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
title: "Refresh",
|
|
89
|
+
task: () => {
|
|
90
|
+
this.projectPackageJson.refresh();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
];
|
|
94
|
+
}
|
|
95
|
+
list() {
|
|
96
|
+
return this.packageManagers.map((manager) => manager.name);
|
|
97
|
+
}
|
|
98
|
+
get(name) {
|
|
99
|
+
if (this.projectPackageJson.preferences.packageManager) {
|
|
100
|
+
name = this.projectPackageJson.preferences.packageManager;
|
|
101
|
+
}
|
|
102
|
+
name = name || "yarn";
|
|
103
|
+
let selectedPackageManager = this.packageManagers.find((manager) => manager.name === name);
|
|
104
|
+
if (!selectedPackageManager) {
|
|
105
|
+
selectedPackageManager = this.packageManagers.find((manager) => manager.name === "npm");
|
|
106
|
+
}
|
|
107
|
+
this.projectPackageJson.setPreference("packageManager", selectedPackageManager.name);
|
|
108
|
+
return selectedPackageManager;
|
|
109
|
+
}
|
|
110
|
+
runScript(scriptName, { ignoreError, ...opts } = {}) {
|
|
111
|
+
const options = {
|
|
112
|
+
cwd: this.projectPackageJson.dir,
|
|
113
|
+
...opts
|
|
114
|
+
};
|
|
115
|
+
const errorPipe = () => (0, operators_1.catchError)((error) => {
|
|
116
|
+
if (ignoreError) {
|
|
117
|
+
return rxjs_1.EMPTY;
|
|
118
|
+
}
|
|
119
|
+
return (0, rxjs_1.throwError)(error);
|
|
120
|
+
});
|
|
121
|
+
return this.get().runScript(scriptName, options).pipe(errorPipe());
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
tslib_1.__decorate([
|
|
125
|
+
(0, di_1.Inject)(),
|
|
126
|
+
tslib_1.__metadata("design:type", ProjectPackageJson_1.ProjectPackageJson)
|
|
127
|
+
], PackageManagersModule.prototype, "projectPackageJson", void 0);
|
|
128
|
+
PackageManagersModule = tslib_1.__decorate([
|
|
129
|
+
(0, di_1.Injectable)({
|
|
130
|
+
imports: [YarnManager_1.YarnManager, YarnBerryManager_1.YarnBerryManager, NpmManager_1.NpmManager, PNpmManager_1.PNpmManager, BunManager_1.BunManager]
|
|
131
|
+
}),
|
|
132
|
+
tslib_1.__param(0, (0, di_1.Inject)("package:manager")),
|
|
133
|
+
tslib_1.__metadata("design:paramtypes", [Array])
|
|
134
|
+
], PackageManagersModule);
|
|
135
|
+
exports.PackageManagersModule = PackageManagersModule;
|
|
136
|
+
//# sourceMappingURL=PackageManagersModule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PackageManagersModule.js","sourceRoot":"","sources":["../../../src/packageManagers/PackageManagersModule.ts"],"names":[],"mappings":";;;;AAAA,iCAA4C;AAE5C,wDAAmD;AACnD,kEAA6D;AAC7D,sDAAiD;AACjD,wDAAmD;AACnD,8CAA0C;AAC1C,+BAAuC;AACvC,uEAAkE;AAClE,4DAAuD;AAEvD,sDAAiD;AAEjD,SAAS,6BAA6B,CAAC,IAAS;IAC9C,MAAM,QAAQ,GAAG,CAAC,IAAsB,EAAE,EAAE;QAC1C,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAiB,CAAC,CAAC;SAC3D,GAAG,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC;AAWM,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAIiB;IAFvC,kBAAkB,CAAqB;IAEjD,YAAiD,eAA8B;QAA9B,oBAAe,GAAf,eAAe,CAAe;QAC7E,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,CAAC,UAA0B,EAAE;QAC/B,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACxD,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC;QAE7C,OAAO,GAAG;YACR,GAAG,OAAO;YACV,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;YAChC,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBACd,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ;aAC3C;SACF,CAAC;QAEF,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC;QAEvC,OAAO,cAAc,CAAC,IAAI,CAAC,OAAc,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,CAAC,UAA0B,EAAE;QAClC,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACxD,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC;QAE7C,MAAM,OAAO,GAAG,6BAA6B,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QACvF,MAAM,IAAI,GAAG,6BAA6B,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAEjF,OAAO,GAAG;YACR,GAAG,OAAO;YACV,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;YAChC,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBACd,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ;aAC3C;SACF,CAAC;QAEF,MAAM,SAAS,GAAG,GAAG,EAAE,CACrB,IAAA,sBAAU,EAAC,CAAC,KAAU,EAAE,EAAE;YACxB,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,yCAAyC,CAAC,EAAE;gBACtE,OAAO,IAAA,iBAAU,EACf,IAAI,KAAK,CAAC,mCAAmC,cAAc,CAAC,IAAI,8CAA8C,CAAC,CAChH,CAAC;aACH;YAED,OAAO,IAAA,iBAAU,EAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEL,OAAO;YACL;gBACE,KAAK,EAAE,oBAAoB;gBAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO;gBAC9C,IAAI,EAAE,GAAG,EAAE;oBACT,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;gBAClC,CAAC;aACF;YACD;gBACE,KAAK,EAAE,iCAAiC,cAAc,CAAC,IAAI,EAAE;gBAC7D,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS;gBAC9C,IAAI,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,OAAc,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;aACrE;YACD;gBACE,KAAK,EAAE,0BAA0B,cAAc,CAAC,IAAI,EAAE;gBACtD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM;gBACxB,IAAI,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,OAAc,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;aACvE;YACD;gBACE,KAAK,EAAE,6BAA6B,cAAc,CAAC,IAAI,EAAE;gBACzD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM;gBAC3B,IAAI,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,OAAc,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;aAC7E;YACD;gBACE,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,GAAG,EAAE;oBACT,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBACpC,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,GAAG,CAAC,IAAa;QACf,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,cAAc,EAAE;YACtD,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,cAAc,CAAC;SAC3D;QAED,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC;QAEtB,IAAI,sBAAsB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAE3F,IAAI,CAAC,sBAAsB,EAAE;YAC3B,sBAAsB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK,CAAE,CAAC;SAC1F;QAED,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAErF,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAEM,SAAS,CACd,UAAkB,EAClB,EACE,WAAW,EACX,GAAG,IAAI,KAIe,EAAE;QAE1B,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;YAChC,GAAG,IAAI;SACR,CAAC;QAEF,MAAM,SAAS,GAAG,GAAG,EAAE,CACrB,IAAA,sBAAU,EAAC,CAAC,KAAU,EAAE,EAAE;YACxB,IAAI,WAAW,EAAE;gBACf,OAAO,YAAK,CAAC;aACd;YAED,OAAO,IAAA,iBAAU,EAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEL,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC;CACF,CAAA;AArIC;IAAC,IAAA,WAAM,GAAE;sCACqB,uCAAkB;iEAAC;AAFtC,qBAAqB;IAHjC,IAAA,eAAU,EAAC;QACV,OAAO,EAAE,CAAC,yBAAW,EAAE,mCAAgB,EAAE,uBAAU,EAAE,yBAAW,EAAE,uBAAU,CAAC;KAC9E,CAAC;IAKa,mBAAA,IAAA,WAAM,EAAC,iBAAiB,CAAC,CAAA;;GAJ3B,qBAAqB,CAsIjC;AAtIY,sDAAqB"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./supports/BaseManager"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./supports/NpmManager"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./supports/YarnManager"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./supports/PNpmManager"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./PackageManagersModule"), exports);
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/packageManagers/index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,gEAAsC;AACtC,iEAAuC;AACvC,iEAAuC;AACvC,kEAAwC"}
|
|
@@ -3,13 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseManager = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@tsed/di");
|
|
6
|
-
const CliExeca_1 = require("
|
|
6
|
+
const CliExeca_1 = require("../../services/CliExeca");
|
|
7
7
|
class BaseManager {
|
|
8
8
|
verboseOpt = "--verbose";
|
|
9
9
|
cliExeca;
|
|
10
|
-
get runCmd() {
|
|
11
|
-
return `${this.cmd} run`;
|
|
12
|
-
}
|
|
13
10
|
has() {
|
|
14
11
|
try {
|
|
15
12
|
this.cliExeca.runSync(this.cmd, ["--version"]);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BaseManager.js","sourceRoot":"","sources":["../../../../src/packageManagers/supports/BaseManager.ts"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAGhC,sDAAiD;AAKjD,MAAsB,WAAW;IAIrB,UAAU,GAAG,WAAW,CAAC;IAGzB,QAAQ,CAAW;IAE7B,GAAG;QACD,IAAI;YACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,IAAI,CAAC,IAAwB,IAAkB,CAAC;IAQtD,SAAS,CAAC,MAAc,EAAE,OAAuB;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,IAAW,EAAE,OAAoD;QAChF,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,EAAE,OAAO,CAAC,CAAC;IAC9H,CAAC;CACF;AA7BC;IAAC,IAAA,WAAM,EAAC,mBAAQ,CAAC;sCACG,mBAAQ;6CAAC;AAP/B,kCAmCC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BunManager = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const di_1 = require("@tsed/di");
|
|
6
|
+
const BaseManager_1 = require("./BaseManager");
|
|
7
|
+
let BunManager = class BunManager extends BaseManager_1.BaseManager {
|
|
8
|
+
name = "bun";
|
|
9
|
+
cmd = "bun";
|
|
10
|
+
add(deps, options) {
|
|
11
|
+
return this.run("add", [...deps], options);
|
|
12
|
+
}
|
|
13
|
+
addDev(deps, options) {
|
|
14
|
+
return this.run("add", ["-d", ...deps], options);
|
|
15
|
+
}
|
|
16
|
+
install(options) {
|
|
17
|
+
return this.run("install", [options.verbose && "--verbose"], options);
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
BunManager = tslib_1.__decorate([
|
|
21
|
+
(0, di_1.Injectable)({
|
|
22
|
+
type: "package:manager"
|
|
23
|
+
})
|
|
24
|
+
], BunManager);
|
|
25
|
+
exports.BunManager = BunManager;
|
|
26
|
+
//# sourceMappingURL=BunManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BunManager.js","sourceRoot":"","sources":["../../../../src/packageManagers/supports/BunManager.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAGpC,+CAA0D;AAKnD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,yBAAW;IAChC,IAAI,GAAG,KAAK,CAAC;IACb,GAAG,GAAG,KAAK,CAAC;IAErB,GAAG,CAAC,IAAc,EAAE,OAAuB;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,IAAc,EAAE,OAAuB;QAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,CAAC,OAA4C;QAClD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;AAfY,UAAU;IAHtB,IAAA,eAAU,EAAC;QACV,IAAI,EAAE,iBAAiB;KACxB,CAAC;GACW,UAAU,CAetB;AAfY,gCAAU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NpmManager.js","sourceRoot":"","sources":["../../../../src/
|
|
1
|
+
{"version":3,"file":"NpmManager.js","sourceRoot":"","sources":["../../../../src/packageManagers/supports/NpmManager.ts"],"names":[],"mappings":";;;;AAAA,+CAA0D;AAC1D,iCAAoC;AAM7B,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,yBAAW;IAChC,IAAI,GAAW,KAAK,CAAC;IACrB,GAAG,GAAW,KAAK,CAAC;IAE7B,GAAG,CAAC,IAAc,EAAE,OAAuB;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACpG,CAAC;IAED,MAAM,CAAC,IAAc,EAAE,OAAuB;QAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACxG,CAAC;IAED,OAAO,CAAC,OAAuB;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;CACF,CAAA;AAfY,UAAU;IAHtB,IAAA,eAAU,EAAC;QACV,IAAI,EAAE,iBAAiB;KACxB,CAAC;GACW,UAAU,CAetB;AAfY,gCAAU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PNpmManager.js","sourceRoot":"","sources":["../../../../src/
|
|
1
|
+
{"version":3,"file":"PNpmManager.js","sourceRoot":"","sources":["../../../../src/packageManagers/supports/PNpmManager.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAEpC,+CAA0D;AAKnD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,yBAAW;IACjC,IAAI,GAAG,MAAM,CAAC;IACd,GAAG,GAAG,MAAM,CAAC;IAEtB,GAAG,CAAC,IAAc,EAAE,OAAuB;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,IAAc,EAAE,OAAuB;QAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CAAC,OAAuB;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;CACF,CAAA;AAfY,WAAW;IAHvB,IAAA,eAAU,EAAC;QACV,IAAI,EAAE,iBAAiB;KACxB,CAAC;GACW,WAAW,CAevB;AAfY,kCAAW"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const di_1 = require("@tsed/di");
|
|
6
6
|
const BaseManager_1 = require("./BaseManager");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const CliYaml_1 = require("
|
|
8
|
+
const CliYaml_1 = require("../../services/CliYaml");
|
|
9
9
|
let YarnBerryManager = class YarnBerryManager extends BaseManager_1.BaseManager {
|
|
10
10
|
name = "yarn_berry";
|
|
11
11
|
cmd = "yarn";
|
package/lib/cjs/{services/packageManagers → packageManagers/supports}/YarnBerryManager.js.map
RENAMED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YarnBerryManager.js","sourceRoot":"","sources":["../../../../src/
|
|
1
|
+
{"version":3,"file":"YarnBerryManager.js","sourceRoot":"","sources":["../../../../src/packageManagers/supports/YarnBerryManager.ts"],"names":[],"mappings":";;;;AAAA,iCAA4C;AAG5C,+CAA8E;AAC9E,+BAA0B;AAC1B,oDAA+C;AAKxC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,yBAAW;IACtC,IAAI,GAAG,YAAY,CAAC;IACpB,GAAG,GAAG,MAAM,CAAC;IAGZ,OAAO,CAAU;IAE3B,KAAK,CAAC,IAAI,CAAC,OAA2B;QACpC,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtB,yBAAyB;QACzB,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAI,EAAE,aAAa,CAAC,EAAE;YAC1D,UAAU,EAAE,cAAc;SAC3B,CAAC,CAAC;QAEH,uBAAuB;QACvB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,GAAG,CAAC,IAAc,EAAE,OAAuB;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,IAAc,EAAE,OAAuB;QAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,CAAC,OAA4C;QAClD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;AA3BC;IAAC,IAAA,WAAM,GAAE;sCACU,iBAAO;iDAAC;AALhB,gBAAgB;IAH5B,IAAA,eAAU,EAAC;QACV,IAAI,EAAE,iBAAiB;KACxB,CAAC;GACW,gBAAgB,CA+B5B;AA/BY,4CAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YarnManager.js","sourceRoot":"","sources":["../../../../src/
|
|
1
|
+
{"version":3,"file":"YarnManager.js","sourceRoot":"","sources":["../../../../src/packageManagers/supports/YarnManager.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAGpC,+CAA0D;AAKnD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,yBAAW;IACjC,IAAI,GAAG,MAAM,CAAC;IACd,GAAG,GAAG,MAAM,CAAC;IAEtB,GAAG,CAAC,IAAc,EAAE,OAAuB;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,IAAc,EAAE,OAAuB;QAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,CAAC,OAA4C;QAClD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;AAfY,WAAW;IAHvB,IAAA,eAAU,EAAC;QACV,IAAI,EAAE,iBAAiB;KACxB,CAAC;GACW,WAAW,CAevB;AAfY,kCAAW"}
|
|
@@ -10,6 +10,7 @@ const loadPlugins_1 = require("../utils/loadPlugins");
|
|
|
10
10
|
const CliHooks_1 = require("./CliHooks");
|
|
11
11
|
const NpmRegistryClient_1 = require("./NpmRegistryClient");
|
|
12
12
|
const ProjectPackageJson_1 = require("./ProjectPackageJson");
|
|
13
|
+
const PackageManagersModule_1 = require("../packageManagers/PackageManagersModule");
|
|
13
14
|
function mapPlugins({ package: { name, description = "", ...otherProps } }) {
|
|
14
15
|
return {
|
|
15
16
|
name: `${name} ${description}`.trim(),
|
|
@@ -23,6 +24,7 @@ let CliPlugins = class CliPlugins {
|
|
|
23
24
|
injector;
|
|
24
25
|
cliHooks;
|
|
25
26
|
packageJson;
|
|
27
|
+
packageManagers;
|
|
26
28
|
async searchPlugins(keyword = "", options = {}) {
|
|
27
29
|
const result = await this.npmRegistryClient.search(this.getKeyword(keyword), options);
|
|
28
30
|
return result.filter(({ package: { name } }) => this.isPlugin(name)).map(mapPlugins);
|
|
@@ -45,7 +47,7 @@ let CliPlugins = class CliPlugins {
|
|
|
45
47
|
{
|
|
46
48
|
title: "Install",
|
|
47
49
|
task: (0, createTasksRunner_1.createSubTasks)(() => {
|
|
48
|
-
return this.
|
|
50
|
+
return this.packageManagers.install(ctx);
|
|
49
51
|
}, { ...ctx, concurrent: false })
|
|
50
52
|
}
|
|
51
53
|
];
|
|
@@ -65,21 +67,25 @@ tslib_1.__decorate([
|
|
|
65
67
|
tslib_1.__metadata("design:type", String)
|
|
66
68
|
], CliPlugins.prototype, "name", void 0);
|
|
67
69
|
tslib_1.__decorate([
|
|
68
|
-
(0, di_1.Inject)(),
|
|
70
|
+
(0, di_1.Inject)(NpmRegistryClient_1.NpmRegistryClient),
|
|
69
71
|
tslib_1.__metadata("design:type", NpmRegistryClient_1.NpmRegistryClient)
|
|
70
72
|
], CliPlugins.prototype, "npmRegistryClient", void 0);
|
|
71
73
|
tslib_1.__decorate([
|
|
72
|
-
(0, di_1.Inject)(),
|
|
74
|
+
(0, di_1.Inject)(di_1.InjectorService),
|
|
73
75
|
tslib_1.__metadata("design:type", di_1.InjectorService)
|
|
74
76
|
], CliPlugins.prototype, "injector", void 0);
|
|
75
77
|
tslib_1.__decorate([
|
|
76
|
-
(0, di_1.Inject)(),
|
|
78
|
+
(0, di_1.Inject)(CliHooks_1.CliHooks),
|
|
77
79
|
tslib_1.__metadata("design:type", CliHooks_1.CliHooks)
|
|
78
80
|
], CliPlugins.prototype, "cliHooks", void 0);
|
|
79
81
|
tslib_1.__decorate([
|
|
80
|
-
(0, di_1.Inject)(),
|
|
82
|
+
(0, di_1.Inject)(ProjectPackageJson_1.ProjectPackageJson),
|
|
81
83
|
tslib_1.__metadata("design:type", ProjectPackageJson_1.ProjectPackageJson)
|
|
82
84
|
], CliPlugins.prototype, "packageJson", void 0);
|
|
85
|
+
tslib_1.__decorate([
|
|
86
|
+
(0, di_1.Inject)(PackageManagersModule_1.PackageManagersModule),
|
|
87
|
+
tslib_1.__metadata("design:type", PackageManagersModule_1.PackageManagersModule)
|
|
88
|
+
], CliPlugins.prototype, "packageManagers", void 0);
|
|
83
89
|
CliPlugins = tslib_1.__decorate([
|
|
84
90
|
(0, di_1.Injectable)()
|
|
85
91
|
], CliPlugins);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliPlugins.js","sourceRoot":"","sources":["../../../src/services/CliPlugins.ts"],"names":[],"mappings":";;;;AAAA,kEAA0D;AAC1D,0DAA0B;AAC1B,iCAAuE;AACvE,kEAA6D;AAC7D,sDAAiD;AACjD,yCAAoC;AACpC,2DAAsD;AACtD,6DAAwD;
|
|
1
|
+
{"version":3,"file":"CliPlugins.js","sourceRoot":"","sources":["../../../src/services/CliPlugins.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const ProjectPackageJson_1 = require("./ProjectPackageJson");
|
|
|
18
18
|
// @ts-ignore
|
|
19
19
|
const inquirer_autocomplete_prompt_1 = tslib_1.__importDefault(require("inquirer-autocomplete-prompt"));
|
|
20
20
|
const mapCommanderOptions_1 = require("../utils/mapCommanderOptions");
|
|
21
|
+
const packageManagers_1 = require("../packageManagers");
|
|
21
22
|
inquirer_1.default.registerPrompt("autocomplete", inquirer_autocomplete_prompt_1.default);
|
|
22
23
|
let CliService = class CliService {
|
|
23
24
|
program = new commander_1.Command();
|
|
@@ -26,6 +27,7 @@ let CliService = class CliService {
|
|
|
26
27
|
injector;
|
|
27
28
|
hooks;
|
|
28
29
|
projectPkg;
|
|
30
|
+
packageManagers;
|
|
29
31
|
commands = new Map();
|
|
30
32
|
/**
|
|
31
33
|
* Parse process.argv and runLifecycle action
|
|
@@ -74,7 +76,7 @@ let CliService = class CliService {
|
|
|
74
76
|
{
|
|
75
77
|
title: "Install dependencies",
|
|
76
78
|
enabled: () => this.reinstallAfterRun && (this.projectPkg.rewrite || this.projectPkg.reinstall),
|
|
77
|
-
task: (0, createTasksRunner_1.createSubTasks)(() => this.
|
|
79
|
+
task: (0, createTasksRunner_1.createSubTasks)(() => this.packageManagers.install(data), { ...data, concurrent: false })
|
|
78
80
|
},
|
|
79
81
|
...(await this.getPostInstallTasks(cmdName, data))
|
|
80
82
|
];
|
|
@@ -274,6 +276,10 @@ tslib_1.__decorate([
|
|
|
274
276
|
(0, di_1.Inject)(),
|
|
275
277
|
tslib_1.__metadata("design:type", ProjectPackageJson_1.ProjectPackageJson)
|
|
276
278
|
], CliService.prototype, "projectPkg", void 0);
|
|
279
|
+
tslib_1.__decorate([
|
|
280
|
+
(0, di_1.Inject)(packageManagers_1.PackageManagersModule),
|
|
281
|
+
tslib_1.__metadata("design:type", packageManagers_1.PackageManagersModule)
|
|
282
|
+
], CliService.prototype, "packageManagers", void 0);
|
|
277
283
|
CliService = tslib_1.__decorate([
|
|
278
284
|
(0, di_1.Injectable)()
|
|
279
285
|
], CliService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliService.js","sourceRoot":"","sources":["../../../src/services/CliService.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,iCAAsH;AACtH,yCAA4C;AAC5C,gEAAgC;AAChC,+BAAwB;AACxB,kEAA6D;AAG7D,kEAA6E;AAC7E,oEAA+D;AAC/D,gEAA2D;AAC3D,sDAAiD;AACjD,yCAAoC;AACpC,6DAAwD;AACxD,6DAA6D;AAC7D,aAAa;AACb,wGAAwE;AACxE,sEAAiE;
|
|
1
|
+
{"version":3,"file":"CliService.js","sourceRoot":"","sources":["../../../src/services/CliService.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,23 +5,9 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const core_1 = require("@tsed/core");
|
|
6
6
|
const di_1 = require("@tsed/di");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const rxjs_1 = require("rxjs");
|
|
9
|
-
const operators_1 = require("rxjs/operators");
|
|
10
8
|
const read_pkg_up_1 = tslib_1.__importDefault(require("read-pkg-up"));
|
|
11
9
|
const CliFs_1 = require("./CliFs");
|
|
12
10
|
const isValidVersion_1 = require("../utils/isValidVersion");
|
|
13
|
-
const YarnManager_1 = require("./packageManagers/YarnManager");
|
|
14
|
-
const YarnBerryManager_1 = require("./packageManagers/YarnBerryManager");
|
|
15
|
-
const NpmManager_1 = require("./packageManagers/NpmManager");
|
|
16
|
-
const PNpmManager_1 = require("./packageManagers/PNpmManager");
|
|
17
|
-
function mapPackagesWithInvalidVersion(deps) {
|
|
18
|
-
const toString = (info) => {
|
|
19
|
-
return info[1] === "latest" ? info[0] : info.join("@");
|
|
20
|
-
};
|
|
21
|
-
return Object.entries(deps)
|
|
22
|
-
.filter(([, version]) => !(0, isValidVersion_1.isValidVersion)(version))
|
|
23
|
-
.map(toString);
|
|
24
|
-
}
|
|
25
11
|
function sortKeys(obj) {
|
|
26
12
|
return Object.entries(obj)
|
|
27
13
|
.sort((k1, k2) => {
|
|
@@ -48,15 +34,13 @@ function mapPackages(deps) {
|
|
|
48
34
|
let ProjectPackageJson = class ProjectPackageJson {
|
|
49
35
|
configuration;
|
|
50
36
|
fs;
|
|
51
|
-
packageManagers;
|
|
52
37
|
rewrite = false;
|
|
53
38
|
reinstall = false;
|
|
54
39
|
GH_TOKEN;
|
|
55
40
|
raw;
|
|
56
|
-
constructor(configuration, fs
|
|
41
|
+
constructor(configuration, fs) {
|
|
57
42
|
this.configuration = configuration;
|
|
58
43
|
this.fs = fs;
|
|
59
|
-
this.packageManagers = packageManagers;
|
|
60
44
|
this.setRaw({
|
|
61
45
|
name: "",
|
|
62
46
|
version: "1.0.0",
|
|
@@ -65,7 +49,6 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
65
49
|
dependencies: {},
|
|
66
50
|
devDependencies: {}
|
|
67
51
|
});
|
|
68
|
-
this.packageManagers = packageManagers.filter((manager) => manager.has());
|
|
69
52
|
}
|
|
70
53
|
get path() {
|
|
71
54
|
return (0, path_1.join)(this.dir, "package.json");
|
|
@@ -108,9 +91,6 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
108
91
|
get preferences() {
|
|
109
92
|
return this.raw[this.configuration.name];
|
|
110
93
|
}
|
|
111
|
-
get availablePackageManagers() {
|
|
112
|
-
return this.packageManagers.map((manager) => manager.name);
|
|
113
|
-
}
|
|
114
94
|
$loadPackageJson() {
|
|
115
95
|
return this.read();
|
|
116
96
|
}
|
|
@@ -133,21 +113,6 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
133
113
|
}
|
|
134
114
|
};
|
|
135
115
|
}
|
|
136
|
-
packageManager(name) {
|
|
137
|
-
if (this.preferences.packageManager) {
|
|
138
|
-
name = this.preferences.packageManager;
|
|
139
|
-
}
|
|
140
|
-
name = name || "yarn";
|
|
141
|
-
let selectedPackageManager = this.packageManagers.find((manager) => manager.name === name);
|
|
142
|
-
if (!selectedPackageManager) {
|
|
143
|
-
selectedPackageManager = this.packageManagers.find((manager) => manager.name === "npm");
|
|
144
|
-
}
|
|
145
|
-
this.setPreference("packageManager", selectedPackageManager.name);
|
|
146
|
-
return selectedPackageManager;
|
|
147
|
-
}
|
|
148
|
-
getRunCmd() {
|
|
149
|
-
return this.packageManager().runCmd;
|
|
150
|
-
}
|
|
151
116
|
addDevDependency(pkg, version) {
|
|
152
117
|
this.devDependencies[pkg] = version;
|
|
153
118
|
this.reinstall = true;
|
|
@@ -239,71 +204,6 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
239
204
|
};
|
|
240
205
|
return this;
|
|
241
206
|
}
|
|
242
|
-
init(options = {}) {
|
|
243
|
-
const packageManager = this.packageManager(options.packageManager);
|
|
244
|
-
options.packageManager = packageManager.name;
|
|
245
|
-
options = {
|
|
246
|
-
...options,
|
|
247
|
-
cwd: this.dir,
|
|
248
|
-
env: {
|
|
249
|
-
...process.env,
|
|
250
|
-
GH_TOKEN: this.GH_TOKEN
|
|
251
|
-
}
|
|
252
|
-
};
|
|
253
|
-
this.write();
|
|
254
|
-
this.rewrite = true;
|
|
255
|
-
return packageManager.init(options);
|
|
256
|
-
}
|
|
257
|
-
install(options = {}) {
|
|
258
|
-
const packageManager = this.packageManager(options.packageManager);
|
|
259
|
-
options.packageManager = packageManager.name;
|
|
260
|
-
const devDeps = mapPackagesWithInvalidVersion(this.devDependencies);
|
|
261
|
-
const deps = mapPackagesWithInvalidVersion(this.dependencies);
|
|
262
|
-
options = {
|
|
263
|
-
...options,
|
|
264
|
-
cwd: this.dir,
|
|
265
|
-
env: {
|
|
266
|
-
...process.env,
|
|
267
|
-
GH_TOKEN: this.GH_TOKEN
|
|
268
|
-
}
|
|
269
|
-
};
|
|
270
|
-
const errorPipe = () => (0, operators_1.catchError)((error) => {
|
|
271
|
-
if (error.stderr.startsWith("error Your lockfile needs to be updated")) {
|
|
272
|
-
return (0, rxjs_1.throwError)(new Error(`yarn.lock file is outdated. Run ${packageManager.name}, commit the updated lockfile and try again.`));
|
|
273
|
-
}
|
|
274
|
-
return (0, rxjs_1.throwError)(error);
|
|
275
|
-
});
|
|
276
|
-
return [
|
|
277
|
-
{
|
|
278
|
-
title: "Write package.json",
|
|
279
|
-
enabled: () => this.rewrite,
|
|
280
|
-
task: () => {
|
|
281
|
-
this.write();
|
|
282
|
-
}
|
|
283
|
-
},
|
|
284
|
-
{
|
|
285
|
-
title: `Installing dependencies using ${packageManager.name}`,
|
|
286
|
-
skip: () => !this.reinstall,
|
|
287
|
-
task: () => packageManager.install(options).pipe(errorPipe())
|
|
288
|
-
},
|
|
289
|
-
{
|
|
290
|
-
title: `Add dependencies using ${packageManager.name}`,
|
|
291
|
-
skip: () => !deps.length,
|
|
292
|
-
task: () => packageManager.add(deps, options).pipe(errorPipe())
|
|
293
|
-
},
|
|
294
|
-
{
|
|
295
|
-
title: `Add devDependencies using ${packageManager.name}`,
|
|
296
|
-
skip: () => !devDeps.length,
|
|
297
|
-
task: () => packageManager.addDev(devDeps, options).pipe(errorPipe())
|
|
298
|
-
},
|
|
299
|
-
{
|
|
300
|
-
title: "Refresh",
|
|
301
|
-
task: () => {
|
|
302
|
-
this.refresh();
|
|
303
|
-
}
|
|
304
|
-
}
|
|
305
|
-
];
|
|
306
|
-
}
|
|
307
207
|
/**
|
|
308
208
|
* Import a module from the project workspace
|
|
309
209
|
* @param mod
|
|
@@ -311,19 +211,6 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
311
211
|
importModule(mod) {
|
|
312
212
|
return this.fs.importModule(mod, this.dir);
|
|
313
213
|
}
|
|
314
|
-
runScript(scriptName, { ignoreError, ...opts } = {}) {
|
|
315
|
-
const options = {
|
|
316
|
-
cwd: this.dir,
|
|
317
|
-
...opts
|
|
318
|
-
};
|
|
319
|
-
const errorPipe = () => (0, operators_1.catchError)((error) => {
|
|
320
|
-
if (ignoreError) {
|
|
321
|
-
return rxjs_1.EMPTY;
|
|
322
|
-
}
|
|
323
|
-
return (0, rxjs_1.throwError)(error);
|
|
324
|
-
});
|
|
325
|
-
return this.packageManager().runScript(scriptName, options).pipe(errorPipe());
|
|
326
|
-
}
|
|
327
214
|
setGhToken(GH_TOKEN) {
|
|
328
215
|
this.GH_TOKEN = GH_TOKEN;
|
|
329
216
|
}
|
|
@@ -388,12 +275,9 @@ let ProjectPackageJson = class ProjectPackageJson {
|
|
|
388
275
|
}
|
|
389
276
|
};
|
|
390
277
|
ProjectPackageJson = tslib_1.__decorate([
|
|
391
|
-
(0, di_1.Injectable)({
|
|
392
|
-
imports: [YarnManager_1.YarnManager, YarnBerryManager_1.YarnBerryManager, NpmManager_1.NpmManager, PNpmManager_1.PNpmManager]
|
|
393
|
-
}),
|
|
278
|
+
(0, di_1.Injectable)({}),
|
|
394
279
|
tslib_1.__param(0, (0, di_1.Configuration)()),
|
|
395
|
-
tslib_1.
|
|
396
|
-
tslib_1.__metadata("design:paramtypes", [Object, CliFs_1.CliFs, Array])
|
|
280
|
+
tslib_1.__metadata("design:paramtypes", [Object, CliFs_1.CliFs])
|
|
397
281
|
], ProjectPackageJson);
|
|
398
282
|
exports.ProjectPackageJson = ProjectPackageJson;
|
|
399
283
|
//# sourceMappingURL=ProjectPackageJson.js.map
|