@midwayjs/view-ejs 3.0.0-beta.16 → 3.0.0-beta.17

package/dist/config/config.default.d.ts

@@ -1,3 +1,21 @@
-declare const _default: any;
+declare const _default: (appInfo: any) => {
+    /**
+     * @member Config#ejs
+     * @property {String} [root=${appDir}/view] - the root directory of ejs files
+     * @property {Boolean} [cache=true] - compiled functions are cached, only work using `ctx.render`
+     * @property {Boolean} [debug=false] - output generated function body
+     * @property {Boolean} [compileDebug=true] - when false no debug instrumentation is compiled
+     * @property {String} [delimiter] - character to use with angle brackets for open/close
+     * @property {Boolean} [strict=false] - when set to true, generated function is in strict mode
+     */
+    ejs: {
+        root: string;
+        cache: boolean;
+        debug: boolean;
+        compileDebug: boolean;
+        delimiter: any;
+        strict: boolean;
+    };
+};
 export default _default;
 //# sourceMappingURL=config.default.d.ts.map

package/dist/config/config.default.js

@@ -1,4 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = require('egg-view-ejs/config/config.default');
+const path = require("path");
+exports.default = appInfo => {
+    return {
+        /**
+         * @member Config#ejs
+         * @property {String} [root=${appDir}/view] - the root directory of ejs files
+         * @property {Boolean} [cache=true] - compiled functions are cached, only work using `ctx.render`
+         * @property {Boolean} [debug=false] - output generated function body
+         * @property {Boolean} [compileDebug=true] - when false no debug instrumentation is compiled
+         * @property {String} [delimiter] - character to use with angle brackets for open/close
+         * @property {Boolean} [strict=false] - when set to true, generated function is in strict mode
+         */
+        ejs: {
+            root: path.join(appInfo.appDir, 'view'),
+            cache: true,
+            debug: false,
+            compileDebug: true,
+            delimiter: null,
+            strict: false,
+        },
+    };
+};
 //# sourceMappingURL=config.default.js.map

package/dist/config/config.local.d.ts

@@ -1,3 +1,4 @@
-declare const _default: any;
-export default _default;
+export declare const ejs: {
+    cache: boolean;
+};
 //# sourceMappingURL=config.local.d.ts.map

package/dist/config/config.local.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = require('egg-view-ejs/config/config.local');
+exports.ejs = void 0;
+exports.ejs = {
+    cache: false,
+};
 //# sourceMappingURL=config.local.js.map

package/dist/configuration.d.ts

@@ -1,6 +1,5 @@
 import * as View from '@midwayjs/view';
 export declare class ViewEJSConfiguration {
-    app: any;
     viewManager: View.ViewManager;
     onReady(): Promise<void>;
 }

package/dist/configuration.js

@@ -11,21 +11,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewEJSConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const mw_util_1 = require("@midwayjs/mw-util");
 const View = require("@midwayjs/view");
 const DefaultConfig = require("./config/config.default");
 const LocalConfig = require("./config/config.local");
+const view_1 = require("./view");
 let ViewEJSConfiguration = class ViewEJSConfiguration {
     async onReady() {
-        const mockApp = (0, mw_util_1.createMockApp)(this.app);
-        mockApp.view = this.viewManager;
-        require('egg-view-ejs/app')(mockApp);
+        this.viewManager.use('ejs', view_1.EjsView);
     }
 };
-__decorate([
-    (0, decorator_1.App)(),
-    __metadata("design:type", Object)
-], ViewEJSConfiguration.prototype, "app", void 0);
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", View.ViewManager)

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { ViewEJSConfiguration as Configuration } from './configuration';
+export * from './view';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,6 +1,17 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.ViewEJSConfiguration; } });
+__exportStar(require("./view"), exports);
 //# sourceMappingURL=index.js.map

package/dist/view.d.ts

@@ -0,0 +1,9 @@
+import { IViewEngine, RenderOptions, ViewManager } from '@midwayjs/view';
+export declare class EjsView implements IViewEngine {
+    ejsConfig: any;
+    viewManager: ViewManager;
+    private renderFile;
+    render(name: string, locals?: Record<string, any>, options?: RenderOptions): Promise<string>;
+    renderString(tpl: string, locals?: Record<string, any>, options?: RenderOptions): Promise<string>;
+}
+//# sourceMappingURL=view.d.ts.map

package/dist/view.js

@@ -0,0 +1,64 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EjsView = void 0;
+const ejs = require("ejs");
+const view_1 = require("@midwayjs/view");
+const decorator_1 = require("@midwayjs/decorator");
+let EjsView = class EjsView {
+    async renderFile(filename, locals, config) {
+        return new Promise((resolve, reject) => {
+            ejs.renderFile(filename, locals, config, (err, result) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(result);
+                }
+            });
+        });
+    }
+    async render(name, locals, options) {
+        const config = Object.assign({}, this.ejsConfig, options, { name });
+        const html = await this.renderFile(name, locals, config);
+        if (!config.layout) {
+            return html;
+        }
+        locals.body = html;
+        const layout = await this.viewManager.resolve(config.layout);
+        return this.renderFile(layout, locals, config);
+    }
+    async renderString(tpl, locals, options) {
+        // should disable cache when no filename
+        const config = Object.assign({}, this.ejsConfig, options, {
+            cache: null,
+        });
+        try {
+            return Promise.resolve(ejs.render(tpl, locals, config));
+        }
+        catch (err) {
+            return Promise.reject(err);
+        }
+    }
+};
+__decorate([
+    (0, decorator_1.Config)('ejs'),
+    __metadata("design:type", Object)
+], EjsView.prototype, "ejsConfig", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", view_1.ViewManager)
+], EjsView.prototype, "viewManager", void 0);
+EjsView = __decorate([
+    (0, decorator_1.Provide)()
+], EjsView);
+exports.EjsView = EjsView;
+//# sourceMappingURL=view.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/view-ejs",
-  "version": "3.0.0-beta.16",
-  "description": "Midway Component for egg-view-ejs",
+  "version": "3.0.0-beta.17",
+  "description": "Midway Component for ejs render",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -15,9 +15,7 @@
     "component",
     "midway-view",
     "view",
-    "ejs",
-    "egg-view",
-    "egg-view-ejs"
+    "ejs"
   ],
   "author": "",
   "files": [
@@ -30,15 +28,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/mw-util": "^1.0.0",
-    "@midwayjs/view": "^3.0.0-beta.16",
-    "egg-view-ejs": "^2.0.1"
+    "@midwayjs/view": "^3.0.0-beta.17",
+    "ejs": "3.1.6"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.16",
-    "@midwayjs/decorator": "^3.0.0-beta.16",
-    "@midwayjs/koa": "^3.0.0-beta.16",
-    "@midwayjs/mock": "^3.0.0-beta.16"
+    "@midwayjs/core": "^3.0.0-beta.17",
+    "@midwayjs/decorator": "^3.0.0-beta.17",
+    "@midwayjs/koa": "^3.0.0-beta.17",
+    "@midwayjs/mock": "^3.0.0-beta.17"
   },
-  "gitHead": "43a32745ac45164dfef1494cba979f9652a6692b"
+  "gitHead": "17a8b5bd3d0b0b21f24dd2f165b5df9097fc3ec4"
 }