@tsed/cli-core 4.6.1 → 4.6.3
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/services/CliProxyAgent.js +26 -4
- package/lib/cjs/services/CliProxyAgent.js.map +1 -1
- package/lib/cjs/services/Renderer.js +10 -5
- package/lib/cjs/services/Renderer.js.map +1 -1
- package/lib/esm/services/CliProxyAgent.js +26 -4
- package/lib/esm/services/CliProxyAgent.js.map +1 -1
- package/lib/esm/services/Renderer.js +10 -5
- package/lib/esm/services/Renderer.js.map +1 -1
- package/lib/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/services/CliProxyAgent.d.ts +2 -0
- package/lib/types/services/Renderer.d.ts +2 -1
- package/package.json +4 -4
|
@@ -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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"}
|
|
@@ -15,9 +15,9 @@ require("../utils/hbs");
|
|
|
15
15
|
const insertImport_1 = require("../utils/renderer/insertImport");
|
|
16
16
|
const insertAfter_1 = require("../utils/renderer/insertAfter");
|
|
17
17
|
class Renderer {
|
|
18
|
-
configuration;
|
|
19
18
|
templateDir;
|
|
20
19
|
fs;
|
|
20
|
+
configuration;
|
|
21
21
|
async render(path, data, options = {}) {
|
|
22
22
|
const { output, templateDir, rootDir } = this.mapOptions(path, options);
|
|
23
23
|
let content = "";
|
|
@@ -110,13 +110,14 @@ class Renderer {
|
|
|
110
110
|
output = (0, normalize_path_1.default)((0, path_1.join)((0, path_1.dirname)(output), options.basename));
|
|
111
111
|
}
|
|
112
112
|
output = output.replace(/\.hbs$/, "");
|
|
113
|
+
if (options.replaces) {
|
|
114
|
+
options.replaces.filter(Boolean).forEach((replace) => {
|
|
115
|
+
output = output.replace(replace, "");
|
|
116
|
+
});
|
|
117
|
+
}
|
|
113
118
|
return { output, templateDir, rootDir };
|
|
114
119
|
}
|
|
115
120
|
}
|
|
116
|
-
tslib_1.__decorate([
|
|
117
|
-
(0, di_1.Configuration)(),
|
|
118
|
-
tslib_1.__metadata("design:type", Object)
|
|
119
|
-
], Renderer.prototype, "configuration", void 0);
|
|
120
121
|
tslib_1.__decorate([
|
|
121
122
|
(0, di_1.Constant)("templateDir"),
|
|
122
123
|
tslib_1.__metadata("design:type", String)
|
|
@@ -125,6 +126,10 @@ tslib_1.__decorate([
|
|
|
125
126
|
(0, di_1.Inject)(),
|
|
126
127
|
tslib_1.__metadata("design:type", CliFs_1.CliFs)
|
|
127
128
|
], Renderer.prototype, "fs", void 0);
|
|
129
|
+
tslib_1.__decorate([
|
|
130
|
+
(0, di_1.Configuration)(),
|
|
131
|
+
tslib_1.__metadata("design:type", Object)
|
|
132
|
+
], Renderer.prototype, "configuration", void 0);
|
|
128
133
|
exports.Renderer = Renderer;
|
|
129
134
|
let RootRendererService = class RootRendererService extends Renderer {
|
|
130
135
|
get rootDir() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.js","sourceRoot":"","sources":["../../../src/services/Renderer.ts"],"names":[],"mappings":";;;;AAAA,qCAAoC;AACpC,iCAAqE;AACrE,sEAAsC;AACtC,uCAAoC;AACpC,4EAA2C;AAC3C,4DAA4B;AAC5B,+BAA6C;AAC7C,+BAAgC;AAChC,mCAA8B;AAC9B,wBAAsB;AACtB,iEAA4D;AAC5D,+DAA0D;
|
|
1
|
+
{"version":3,"file":"Renderer.js","sourceRoot":"","sources":["../../../src/services/Renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
@@ -12,9 +12,9 @@ import "../utils/hbs.js";
|
|
|
12
12
|
import { insertImport } from "../utils/renderer/insertImport.js";
|
|
13
13
|
import { insertAfter } from "../utils/renderer/insertAfter.js";
|
|
14
14
|
export class Renderer {
|
|
15
|
-
configuration;
|
|
16
15
|
templateDir;
|
|
17
16
|
fs;
|
|
17
|
+
configuration;
|
|
18
18
|
async render(path, data, options = {}) {
|
|
19
19
|
const { output, templateDir, rootDir } = this.mapOptions(path, options);
|
|
20
20
|
let content = "";
|
|
@@ -107,13 +107,14 @@ export class Renderer {
|
|
|
107
107
|
output = normalizePath(join(dirname(output), options.basename));
|
|
108
108
|
}
|
|
109
109
|
output = output.replace(/\.hbs$/, "");
|
|
110
|
+
if (options.replaces) {
|
|
111
|
+
options.replaces.filter(Boolean).forEach((replace) => {
|
|
112
|
+
output = output.replace(replace, "");
|
|
113
|
+
});
|
|
114
|
+
}
|
|
110
115
|
return { output, templateDir, rootDir };
|
|
111
116
|
}
|
|
112
117
|
}
|
|
113
|
-
__decorate([
|
|
114
|
-
Configuration(),
|
|
115
|
-
__metadata("design:type", Object)
|
|
116
|
-
], Renderer.prototype, "configuration", void 0);
|
|
117
118
|
__decorate([
|
|
118
119
|
Constant("templateDir"),
|
|
119
120
|
__metadata("design:type", String)
|
|
@@ -122,6 +123,10 @@ __decorate([
|
|
|
122
123
|
Inject(),
|
|
123
124
|
__metadata("design:type", CliFs)
|
|
124
125
|
], Renderer.prototype, "fs", void 0);
|
|
126
|
+
__decorate([
|
|
127
|
+
Configuration(),
|
|
128
|
+
__metadata("design:type", Object)
|
|
129
|
+
], Renderer.prototype, "configuration", void 0);
|
|
125
130
|
let RootRendererService = class RootRendererService extends Renderer {
|
|
126
131
|
get rootDir() {
|
|
127
132
|
return this.configuration.project?.rootDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.js","sourceRoot":"","sources":["../../../src/services/Renderer.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AACrE,OAAO,WAAW,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAC,MAAM,MAAM,CAAC;AAC7C,OAAO,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAChC,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAC9B,OAAO,cAAc,CAAC;AACtB,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"Renderer.js","sourceRoot":"","sources":["../../../src/services/Renderer.ts"],"names":[],"mappings":"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"}
|