@tsed/platform-views 8.0.0-rc.4 → 8.0.0-rc.6
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/decorators/view.js +5 -1
- package/lib/esm/decorators/view.js.map +1 -1
- package/lib/esm/services/PlatformViews.js +26 -47
- package/lib/esm/services/PlatformViews.js.map +1 -1
- package/lib/types/decorators/view.d.ts +5 -1
- package/lib/types/services/PlatformViews.d.ts +4 -5
- package/package.json +14 -14
- package/vitest.config.mts +9 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/decorators/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/decorators/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,IAAI,CAAC,EAAC,MAAM,cAAc,CAAC;AAEvC;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAa,CAAC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import "../domain/PlatformViewsSettings.js";
|
|
2
2
|
import { Env, getValue } from "@tsed/core";
|
|
3
|
-
import {
|
|
3
|
+
import { constant, injectable, ProviderType } from "@tsed/di";
|
|
4
4
|
import { engines, getEngine, requires } from "@tsed/engines";
|
|
5
|
+
import { $asyncAlter } from "@tsed/hooks";
|
|
5
6
|
import Fs from "fs";
|
|
6
7
|
import { extname, join, resolve } from "path";
|
|
7
8
|
import { PLATFORM_VIEWS_EXTENSIONS } from "../domain/PlatformViewsSettings.js";
|
|
@@ -19,10 +20,21 @@ async function patchEJS(ejs) {
|
|
|
19
20
|
/**
|
|
20
21
|
* @platform
|
|
21
22
|
*/
|
|
22
|
-
|
|
23
|
+
export class PlatformViews {
|
|
24
|
+
constructor() {
|
|
25
|
+
this.root = constant("views.root", `${process.cwd()}/views`);
|
|
26
|
+
this.cache = constant("views.cache");
|
|
27
|
+
this.disabled = constant("views.disabled", false);
|
|
28
|
+
this.viewEngine = constant("views.viewEngine", "ejs");
|
|
29
|
+
this.env = constant("env");
|
|
30
|
+
this.extensionsOptions = constant("views.extensions", {});
|
|
31
|
+
this.engineOptions = constant("views.options", {});
|
|
32
|
+
this.#engines = new Map();
|
|
33
|
+
this.#cachePaths = new Map();
|
|
34
|
+
}
|
|
23
35
|
#extensions;
|
|
24
|
-
#engines
|
|
25
|
-
#cachePaths
|
|
36
|
+
#engines;
|
|
37
|
+
#cachePaths;
|
|
26
38
|
async $onInit() {
|
|
27
39
|
if (!this.disabled) {
|
|
28
40
|
this.#extensions = new Map(Object.entries({
|
|
@@ -68,7 +80,7 @@ let PlatformViews = class PlatformViews {
|
|
|
68
80
|
}
|
|
69
81
|
async render(viewPath, options = {}) {
|
|
70
82
|
const { $ctx } = options;
|
|
71
|
-
options = await
|
|
83
|
+
options = await $asyncAlter("$alterRenderOptions", options, $ctx);
|
|
72
84
|
const { path, extension } = this.#cachePaths.get(viewPath) || this.#cachePaths.set(viewPath, this.resolve(viewPath)).get(viewPath);
|
|
73
85
|
const engine = this.getEngine(extension);
|
|
74
86
|
if (!engine) {
|
|
@@ -94,45 +106,12 @@ let PlatformViews = class PlatformViews {
|
|
|
94
106
|
extension
|
|
95
107
|
};
|
|
96
108
|
}
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
], PlatformViews.prototype, "root", void 0);
|
|
106
|
-
__decorate([
|
|
107
|
-
Constant("views.cache"),
|
|
108
|
-
__metadata("design:type", Boolean)
|
|
109
|
-
], PlatformViews.prototype, "cache", void 0);
|
|
110
|
-
__decorate([
|
|
111
|
-
Constant("views.disabled", false),
|
|
112
|
-
__metadata("design:type", String)
|
|
113
|
-
], PlatformViews.prototype, "disabled", void 0);
|
|
114
|
-
__decorate([
|
|
115
|
-
Constant("views.viewEngine", "ejs"),
|
|
116
|
-
__metadata("design:type", String)
|
|
117
|
-
], PlatformViews.prototype, "viewEngine", void 0);
|
|
118
|
-
__decorate([
|
|
119
|
-
Constant("views.extensions", {}),
|
|
120
|
-
__metadata("design:type", Object)
|
|
121
|
-
], PlatformViews.prototype, "extensionsOptions", void 0);
|
|
122
|
-
__decorate([
|
|
123
|
-
Constant("views.options", {}),
|
|
124
|
-
__metadata("design:type", Object)
|
|
125
|
-
], PlatformViews.prototype, "engineOptions", void 0);
|
|
126
|
-
__decorate([
|
|
127
|
-
Inject(),
|
|
128
|
-
__metadata("design:type", InjectorService)
|
|
129
|
-
], PlatformViews.prototype, "injector", void 0);
|
|
130
|
-
PlatformViews = __decorate([
|
|
131
|
-
Module({
|
|
132
|
-
views: {
|
|
133
|
-
exists: true
|
|
134
|
-
}
|
|
135
|
-
})
|
|
136
|
-
], PlatformViews);
|
|
137
|
-
export { PlatformViews };
|
|
109
|
+
}
|
|
110
|
+
injectable(PlatformViews)
|
|
111
|
+
.type(ProviderType.MODULE)
|
|
112
|
+
.configuration({
|
|
113
|
+
views: {
|
|
114
|
+
exists: true
|
|
115
|
+
}
|
|
116
|
+
});
|
|
138
117
|
//# sourceMappingURL=PlatformViews.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlatformViews.js","sourceRoot":"","sources":["../../../src/services/PlatformViews.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PlatformViews.js","sourceRoot":"","sources":["../../../src/services/PlatformViews.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
|
+
import "../domain/PlatformViewsSettings.js";
|
|
1
2
|
import { Env } from "@tsed/core";
|
|
2
|
-
import { InjectorService } from "@tsed/di";
|
|
3
3
|
import { PlatformViewEngine, PlatformViewsEngineOptions, PlatformViewsExtensionsTypes, PlatformViewWritableStream } from "../domain/PlatformViewsSettings.js";
|
|
4
4
|
/**
|
|
5
5
|
* @platform
|
|
6
6
|
*/
|
|
7
7
|
export declare class PlatformViews {
|
|
8
8
|
#private;
|
|
9
|
-
env: Env;
|
|
10
9
|
readonly root: string;
|
|
11
|
-
readonly cache: boolean;
|
|
12
|
-
readonly disabled: string;
|
|
10
|
+
readonly cache: boolean | undefined;
|
|
11
|
+
readonly disabled: string | boolean;
|
|
13
12
|
readonly viewEngine: string;
|
|
13
|
+
protected env: Env | undefined;
|
|
14
14
|
protected extensionsOptions: PlatformViewsExtensionsTypes;
|
|
15
15
|
protected engineOptions: Record<string, PlatformViewsEngineOptions>;
|
|
16
|
-
protected injector: InjectorService;
|
|
17
16
|
$onInit(): Promise<void>;
|
|
18
17
|
loadEngines(): Promise<void>;
|
|
19
18
|
getEngines(): {
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@tsed/platform-views",
|
|
3
3
|
"description": "Views module for Ts.ED Framework",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"version": "8.0.0-rc.
|
|
5
|
+
"version": "8.0.0-rc.6",
|
|
6
6
|
"source": "./src/index.ts",
|
|
7
7
|
"main": "./lib/esm/index.js",
|
|
8
8
|
"module": "./lib/esm/index.js",
|
|
@@ -21,29 +21,29 @@
|
|
|
21
21
|
"test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@tsed/engines": "8.0.0-rc.
|
|
24
|
+
"@tsed/engines": "8.0.0-rc.6",
|
|
25
25
|
"ejs": "^3.1.10",
|
|
26
26
|
"tslib": "2.7.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@tsed/barrels": "8.0.0-rc.
|
|
30
|
-
"@tsed/core": "8.0.0-rc.
|
|
31
|
-
"@tsed/di": "8.0.0-rc.
|
|
32
|
-
"@tsed/engines": "8.0.0-rc.
|
|
33
|
-
"@tsed/exceptions": "8.0.0-rc.
|
|
34
|
-
"@tsed/schema": "8.0.0-rc.
|
|
35
|
-
"@tsed/typescript": "8.0.0-rc.
|
|
29
|
+
"@tsed/barrels": "8.0.0-rc.6",
|
|
30
|
+
"@tsed/core": "8.0.0-rc.6",
|
|
31
|
+
"@tsed/di": "8.0.0-rc.6",
|
|
32
|
+
"@tsed/engines": "8.0.0-rc.6",
|
|
33
|
+
"@tsed/exceptions": "8.0.0-rc.6",
|
|
34
|
+
"@tsed/schema": "8.0.0-rc.6",
|
|
35
|
+
"@tsed/typescript": "8.0.0-rc.6",
|
|
36
36
|
"@types/ejs": "3.1.5",
|
|
37
37
|
"eslint": "9.12.0",
|
|
38
38
|
"typescript": "5.4.5",
|
|
39
39
|
"vitest": "2.1.2"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@tsed/core": "8.0.0-rc.
|
|
43
|
-
"@tsed/di": "8.0.0-rc.
|
|
44
|
-
"@tsed/engines": "8.0.0-rc.
|
|
45
|
-
"@tsed/exceptions": "8.0.0-rc.
|
|
46
|
-
"@tsed/schema": "8.0.0-rc.
|
|
42
|
+
"@tsed/core": "8.0.0-rc.6",
|
|
43
|
+
"@tsed/di": "8.0.0-rc.6",
|
|
44
|
+
"@tsed/engines": "8.0.0-rc.6",
|
|
45
|
+
"@tsed/exceptions": "8.0.0-rc.6",
|
|
46
|
+
"@tsed/schema": "8.0.0-rc.6"
|
|
47
47
|
},
|
|
48
48
|
"peerDependenciesMeta": {
|
|
49
49
|
"@tsed/core": {
|
package/vitest.config.mts
CHANGED
|
@@ -9,13 +9,17 @@ export default defineConfig(
|
|
|
9
9
|
...presets.test,
|
|
10
10
|
coverage: {
|
|
11
11
|
...presets.test.coverage,
|
|
12
|
+
exclude:[
|
|
13
|
+
...presets.test.coverage.exclude,
|
|
14
|
+
"src/decorators/view.ts",
|
|
15
|
+
],
|
|
12
16
|
thresholds: {
|
|
13
|
-
statements:
|
|
14
|
-
branches:
|
|
15
|
-
functions:
|
|
16
|
-
lines:
|
|
17
|
+
statements: 91.3,
|
|
18
|
+
branches: 94.73,
|
|
19
|
+
functions: 76.92,
|
|
20
|
+
lines: 91.3
|
|
17
21
|
}
|
|
18
22
|
}
|
|
19
23
|
}
|
|
20
24
|
}
|
|
21
|
-
);
|
|
25
|
+
);
|