@midwayjs/view 3.19.2 → 4.0.0-alpha.1

package/dist/configuration.js

@@ -58,11 +58,12 @@ let ViewConfiguration = class ViewConfiguration {
         await container.getAsync(viewManager_1.ViewManager);
     }
 };
+exports.ViewConfiguration = ViewConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayApplicationManager)
 ], ViewConfiguration.prototype, "applicationManager", void 0);
-ViewConfiguration = __decorate([
+exports.ViewConfiguration = ViewConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'view',
         importConfigs: [
@@ -73,5 +74,4 @@ ViewConfiguration = __decorate([
         ],
     })
 ], ViewConfiguration);
-exports.ViewConfiguration = ViewConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/contextView.js

@@ -24,7 +24,7 @@ let ContextView = class ContextView {
     async render(name, locals, options) {
         // retrieve fullpath matching name from `config.root`
         const filename = await this.viewManager.resolve(name);
-        options = options !== null && options !== void 0 ? options : {};
+        options = options ?? {};
         options.name = name;
         options.root = filename.replace((0, path_1.normalize)(name), '').replace(/[/\\]$/, '');
         options.locals = locals;
@@ -39,16 +39,15 @@ let ContextView = class ContextView {
         if (!viewEngineName) {
             viewEngineName = this.viewConfig.defaultViewEngine;
         }
-        assert(viewEngineName, `Can't find viewEngine for ${filename}`);
+        assert.ok(viewEngineName, `Can't find viewEngine for ${filename}`);
         // get view engine and render
         const view = await this.getViewEngine(viewEngineName);
         return await view.render(filename, this.setLocals(locals), options);
     }
     async renderString(tpl, locals, options) {
-        var _a;
-        options = options !== null && options !== void 0 ? options : {};
-        const viewEngineName = (_a = options.viewEngine) !== null && _a !== void 0 ? _a : this.viewConfig.defaultViewEngine;
-        assert(viewEngineName, "Can't find viewEngine");
+        options = options ?? {};
+        const viewEngineName = options.viewEngine ?? this.viewConfig.defaultViewEngine;
+        assert.ok(viewEngineName, "Can't find viewEngine");
         // get view engine and render
         const view = await this.getViewEngine(viewEngineName);
         return await view.renderString(tpl, this.setLocals(locals), options);
@@ -56,7 +55,7 @@ let ContextView = class ContextView {
     async getViewEngine(name) {
         // get view engine
         const ViewEngine = this.viewManager.get(name);
-        assert(ViewEngine, `Can't find ViewEngine "${name}"`);
+        assert.ok(ViewEngine, `Can't find ViewEngine "${name}"`);
         // use view engine to render
         const engine = await this.ctx.requestContext.getAsync(ViewEngine);
         // wrap render and renderString to support both async function and generator function
@@ -75,6 +74,7 @@ let ContextView = class ContextView {
         }, this.ctx.locals, locals);
     }
 };
+exports.ContextView = ContextView;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", viewManager_1.ViewManager)
@@ -87,8 +87,7 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], ContextView.prototype, "ctx", void 0);
-ContextView = __decorate([
+exports.ContextView = ContextView = __decorate([
     (0, core_1.Provide)()
 ], ContextView);
-exports.ContextView = ContextView;
 //# sourceMappingURL=contextView.js.map

package/dist/viewManager.js

@@ -53,11 +53,11 @@ let ViewManager = class ViewManager extends Map {
      * @param {Object} viewEngine - the class of view engine
      */
     use(name, viewEngine) {
-        assert(name, 'name is required');
-        assert(!this.has(name), `${name} has been registered`);
-        assert(viewEngine, 'viewEngine is required');
-        assert(viewEngine.prototype.render, 'viewEngine should implement `render` method');
-        assert(viewEngine.prototype.renderString, 'viewEngine should implement `renderString` method');
+        assert.ok(name, 'name is required');
+        assert.ok(!this.has(name), `${name} has been registered`);
+        assert.ok(viewEngine, 'viewEngine is required');
+        assert.ok(viewEngine.prototype.render, 'viewEngine should implement `render` method');
+        assert.ok(viewEngine.prototype.renderString, 'viewEngine should implement `renderString` method');
         this.set(name, viewEngine);
     }
     /**
@@ -75,7 +75,7 @@ let ViewManager = class ViewManager extends Map {
             return filename;
         // try find it with default extension
         filename = await resolvePath([name, name + config.defaultExtension], config.root);
-        assert(filename, `Can't find ${name} from ${config.root.join(',')}`);
+        assert.ok(filename, `Can't find ${name} from ${config.root.join(',')}`);
         // set cache
         this.fileMap.set(name, filename);
         return filename;
@@ -98,8 +98,9 @@ let ViewManager = class ViewManager extends Map {
         return this.extMap.get(ext);
     }
 };
+exports.ViewManager = ViewManager;
 __decorate([
-    (0, core_1.App)(),
+    (0, core_1.MainApp)(),
     __metadata("design:type", Object)
 ], ViewManager.prototype, "app", void 0);
 __decorate([
@@ -112,11 +113,10 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], ViewManager.prototype, "init", null);
-ViewManager = __decorate([
+exports.ViewManager = ViewManager = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], ViewManager);
-exports.ViewManager = ViewManager;
 async function resolvePath(names, root) {
     for (const name of names) {
         for (const dir of root) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/view",
-  "version": "3.19.2",
+  "version": "4.0.0-alpha.1",
   "description": "Midway Component for render view",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -27,9 +27,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/koa": "^3.19.2",
-    "@midwayjs/mock": "^3.19.2"
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/koa": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-alpha.1"
   },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }