@tsed/cli-core 4.6.2 → 4.6.4
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/interfaces/ProjectPreferences.js +1 -0
- package/lib/cjs/interfaces/ProjectPreferences.js.map +1 -1
- package/lib/cjs/services/CliProxyAgent.js +26 -4
- package/lib/cjs/services/CliProxyAgent.js.map +1 -1
- package/lib/esm/interfaces/ProjectPreferences.js +1 -0
- package/lib/esm/interfaces/ProjectPreferences.js.map +1 -1
- package/lib/esm/services/CliProxyAgent.js +26 -4
- package/lib/esm/services/CliProxyAgent.js.map +1 -1
- package/lib/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/interfaces/ProjectPreferences.d.ts +1 -0
- package/lib/types/services/CliProxyAgent.d.ts +2 -0
- package/package.json +4 -4
|
@@ -4,6 +4,7 @@ exports.PackageManager = void 0;
|
|
|
4
4
|
var PackageManager;
|
|
5
5
|
(function (PackageManager) {
|
|
6
6
|
PackageManager["YARN"] = "yarn";
|
|
7
|
+
PackageManager["YARN_BERRY"] = "yarn_berry";
|
|
7
8
|
PackageManager["NPM"] = "npm";
|
|
8
9
|
PackageManager["PNPM"] = "pnpm";
|
|
9
10
|
})(PackageManager = exports.PackageManager || (exports.PackageManager = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectPreferences.js","sourceRoot":"","sources":["../../../src/interfaces/ProjectPreferences.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"ProjectPreferences.js","sourceRoot":"","sources":["../../../src/interfaces/ProjectPreferences.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,2CAAyB,CAAA;IACzB,6BAAW,CAAA;IACX,+BAAa,CAAA;AACf,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB"}
|
|
@@ -8,8 +8,10 @@ const CliExeca_1 = require("./CliExeca");
|
|
|
8
8
|
const change_case_1 = require("change-case");
|
|
9
9
|
const url_1 = require("url");
|
|
10
10
|
const coerce_1 = require("../utils/coerce");
|
|
11
|
+
const ProjectPackageJson_1 = require("./ProjectPackageJson");
|
|
11
12
|
let CliProxyAgent = class CliProxyAgent {
|
|
12
13
|
proxySettings;
|
|
14
|
+
projectPackageJson;
|
|
13
15
|
cliExeca;
|
|
14
16
|
hasProxy() {
|
|
15
17
|
return !!this.proxySettings.url;
|
|
@@ -40,10 +42,26 @@ let CliProxyAgent = class CliProxyAgent {
|
|
|
40
42
|
return;
|
|
41
43
|
}
|
|
42
44
|
const result = await Promise.all([
|
|
43
|
-
this.cliExeca
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
this.cliExeca
|
|
46
|
+
.getAsync("npm", ["config", "get", "proxy"], {
|
|
47
|
+
cwd: this.projectPackageJson.dir
|
|
48
|
+
})
|
|
49
|
+
.catch(() => ""),
|
|
50
|
+
this.cliExeca
|
|
51
|
+
.getAsync("npm", ["config", "get", "http-proxy"], {
|
|
52
|
+
cwd: this.projectPackageJson.dir
|
|
53
|
+
})
|
|
54
|
+
.catch(() => ""),
|
|
55
|
+
this.cliExeca
|
|
56
|
+
.getAsync("npm", ["config", "get", "https-proxy"], {
|
|
57
|
+
cwd: this.projectPackageJson.dir
|
|
58
|
+
})
|
|
59
|
+
.catch(() => ""),
|
|
60
|
+
this.cliExeca
|
|
61
|
+
.getAsync("npm", ["config", "get", "strict-ssl"], {
|
|
62
|
+
cwd: this.projectPackageJson.dir
|
|
63
|
+
})
|
|
64
|
+
.catch(() => "")
|
|
47
65
|
]);
|
|
48
66
|
const [proxy, httpProxy, httpsProxy, strictSsl] = result.map(coerce_1.coerce);
|
|
49
67
|
const url = httpsProxy || httpProxy || proxy;
|
|
@@ -59,6 +77,10 @@ tslib_1.__decorate([
|
|
|
59
77
|
(0, di_1.Value)("proxy", {}),
|
|
60
78
|
tslib_1.__metadata("design:type", Object)
|
|
61
79
|
], CliProxyAgent.prototype, "proxySettings", void 0);
|
|
80
|
+
tslib_1.__decorate([
|
|
81
|
+
(0, di_1.Inject)(),
|
|
82
|
+
tslib_1.__metadata("design:type", ProjectPackageJson_1.ProjectPackageJson)
|
|
83
|
+
], CliProxyAgent.prototype, "projectPackageJson", void 0);
|
|
62
84
|
tslib_1.__decorate([
|
|
63
85
|
(0, di_1.Inject)(),
|
|
64
86
|
tslib_1.__metadata("design:type", CliExeca_1.CliExeca)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliProxyAgent.js","sourceRoot":"","sources":["../../../src/services/CliProxyAgent.ts"],"names":[],"mappings":";;;;AAAA,4DAA4B;AAC5B,iCAAkE;AAClE,yCAAoC;AACpC,6CAAsC;AACtC,6BAAwB;AACxB,4CAAuC;
|
|
1
|
+
{"version":3,"file":"CliProxyAgent.js","sourceRoot":"","sources":["../../../src/services/CliProxyAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectPreferences.js","sourceRoot":"","sources":["../../../src/interfaces/ProjectPreferences.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"ProjectPreferences.js","sourceRoot":"","sources":["../../../src/interfaces/ProjectPreferences.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,2CAAyB,CAAA;IACzB,6BAAW,CAAA;IACX,+BAAa,CAAA;AACf,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB"}
|
|
@@ -5,8 +5,10 @@ import { CliExeca } from "./CliExeca.js";
|
|
|
5
5
|
import { camelCase } from "change-case";
|
|
6
6
|
import { URL } from "url";
|
|
7
7
|
import { coerce } from "../utils/coerce.js";
|
|
8
|
+
import { ProjectPackageJson } from "./ProjectPackageJson.js";
|
|
8
9
|
let CliProxyAgent = class CliProxyAgent {
|
|
9
10
|
proxySettings;
|
|
11
|
+
projectPackageJson;
|
|
10
12
|
cliExeca;
|
|
11
13
|
hasProxy() {
|
|
12
14
|
return !!this.proxySettings.url;
|
|
@@ -37,10 +39,26 @@ let CliProxyAgent = class CliProxyAgent {
|
|
|
37
39
|
return;
|
|
38
40
|
}
|
|
39
41
|
const result = await Promise.all([
|
|
40
|
-
this.cliExeca
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
this.cliExeca
|
|
43
|
+
.getAsync("npm", ["config", "get", "proxy"], {
|
|
44
|
+
cwd: this.projectPackageJson.dir
|
|
45
|
+
})
|
|
46
|
+
.catch(() => ""),
|
|
47
|
+
this.cliExeca
|
|
48
|
+
.getAsync("npm", ["config", "get", "http-proxy"], {
|
|
49
|
+
cwd: this.projectPackageJson.dir
|
|
50
|
+
})
|
|
51
|
+
.catch(() => ""),
|
|
52
|
+
this.cliExeca
|
|
53
|
+
.getAsync("npm", ["config", "get", "https-proxy"], {
|
|
54
|
+
cwd: this.projectPackageJson.dir
|
|
55
|
+
})
|
|
56
|
+
.catch(() => ""),
|
|
57
|
+
this.cliExeca
|
|
58
|
+
.getAsync("npm", ["config", "get", "strict-ssl"], {
|
|
59
|
+
cwd: this.projectPackageJson.dir
|
|
60
|
+
})
|
|
61
|
+
.catch(() => "")
|
|
44
62
|
]);
|
|
45
63
|
const [proxy, httpProxy, httpsProxy, strictSsl] = result.map(coerce);
|
|
46
64
|
const url = httpsProxy || httpProxy || proxy;
|
|
@@ -56,6 +74,10 @@ __decorate([
|
|
|
56
74
|
Value("proxy", {}),
|
|
57
75
|
__metadata("design:type", Object)
|
|
58
76
|
], CliProxyAgent.prototype, "proxySettings", void 0);
|
|
77
|
+
__decorate([
|
|
78
|
+
Inject(),
|
|
79
|
+
__metadata("design:type", ProjectPackageJson)
|
|
80
|
+
], CliProxyAgent.prototype, "projectPackageJson", void 0);
|
|
59
81
|
__decorate([
|
|
60
82
|
Inject(),
|
|
61
83
|
__metadata("design:type", CliExeca)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliProxyAgent.js","sourceRoot":"","sources":["../../../src/services/CliProxyAgent.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAC,MAAM,UAAU,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,GAAG,EAAC,MAAM,KAAK,CAAC;AACxB,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"CliProxyAgent.js","sourceRoot":"","sources":["../../../src/services/CliProxyAgent.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAC,MAAM,UAAU,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,GAAG,EAAC,MAAM,KAAK,CAAC;AACxB,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAcjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,aAAa,CAAmB;IAGtB,kBAAkB,CAAqB;IAGvC,QAAQ,CAAW;IAE7B,QAAQ;QACN,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,IAAsB;QACxB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,EAAC,SAAS,GAAG,IAAI,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAE/C,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,QAAQ;oBAClB,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAQ;oBAC/C,SAAS,EAAE,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;oBACvF,kBAAkB,EAAE,SAAS;iBAC9B;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAE7D,IAAK,MAAc,CAAC,MAAM,CAAC,EAAE;gBAC3B,OAAQ,MAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;aACzC;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEjC,IAAI,QAAQ,EAAE;YACZ,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/B,IAAI,CAAC,QAAQ;iBACV,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE;gBAC3C,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;aACjC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ;iBACV,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE;gBAChD,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;aACjC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ;iBACV,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE;gBACjD,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;aACjC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ;iBACV,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,CAAC,EAAE;gBAChD,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG;aACjC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;SACnB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,UAAU,IAAI,SAAS,IAAI,KAAK,CAAC;QAE7C,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,aAAa,GAAG;gBACnB,GAAG;gBACH,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,KAAK;aACvC,CAAC;SACH;IACH,CAAC;CACF,CAAA;AA9EC;IAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;;oDACa;AAEhC;IAAC,MAAM,EAAE;8BACqB,kBAAkB;yDAAC;AAEjD;IAAC,MAAM,EAAE;8BACW,QAAQ;+CAAC;AARlB,aAAa;IAPzB,UAAU,EAAE;IACZ,aAAa,CAAC;QACb,KAAK,EAAE;YACL,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YACtD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI;SAC5H;KACF,CAAC;GACW,aAAa,CA+EzB;SA/EY,aAAa"}
|