@zenweb/template 5.1.0 → 5.3.0

package/dist/global.d.ts

@@ -1,4 +1,4 @@
-import { TemplateOption } from "./types.js";
+import { TemplateOption } from "./types";
 /**
  * 启用并设置模版渲染
  * - 不传参数: 启用

package/dist/global.js

@@ -1,4 +1,7 @@
-import { $getContext } from "@zenweb/core";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.$template = $template;
+const core_1 = require("@zenweb/core");
 /**
  * 启用并设置模版渲染
  * - 不传参数: 启用
@@ -6,6 +9,6 @@ import { $getContext } from "@zenweb/core";
  * - string: 设置模版文件名
  * - TemplateOption: 详细设置
  */
-export function $template(template_or_option) {
-    return $getContext().template(template_or_option);
+function $template(template_or_option) {
+    return (0, core_1.$getContext)().template(template_or_option);
 }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { SetupFunction } from '@zenweb/core';
-import { TemplateSetupOption, TemplateOption } from './types.js';
-export * from './types.js';
-export * from './global.js';
+import { TemplateSetupOption, TemplateOption } from './types';
+export * from './types';
+export * from './global';
 export default function setup(option: TemplateSetupOption): SetupFunction;
 declare module '@zenweb/core' {
     interface Context {

package/dist/index.js

@@ -1,7 +1,24 @@
-import { RenderManager } from '@zenweb/result';
-import { TemplateRender } from './render.js';
-export * from './types.js';
-export * from './global.js';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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.default = setup;
+const result_1 = require("@zenweb/result");
+const render_1 = require("./render");
+__exportStar(require("./types"), exports);
+__exportStar(require("./global"), exports);
 function contextTemplate(template_or_option) {
     if (template_or_option === false) {
         this.templateOption = undefined;
@@ -17,15 +34,15 @@ function contextTemplate(template_or_option) {
         Object.assign(this.templateOption, template_or_option);
     }
 }
-export default function setup(option) {
+function setup(option) {
     return async function template(setup) {
         if (!option.engineName) {
             option.engineName = option.engine.name;
         }
         setup.debug('option: %o', option);
         setup.assertModuleExists('result', '@zenweb/result');
-        const renderManager = await setup.core.injector.getInstance(RenderManager);
-        renderManager.add(new TemplateRender(option));
+        const renderManager = await setup.core.injector.getInstance(result_1.RenderManager);
+        renderManager.add(new render_1.TemplateRender(option));
         if (!('template' in setup.app.context)) {
             setup.defineContextProperty('template', { value: contextTemplate });
         }

package/dist/render.d.ts

@@ -1,6 +1,6 @@
 import { Context } from '@zenweb/core';
 import { ResultRender } from '@zenweb/result';
-import { TemplateSetupOption } from './types.js';
+import { TemplateSetupOption } from './types';
 export declare class TemplateRender implements ResultRender {
     private _option;
     enwrap: boolean;

package/dist/render.js

@@ -1,11 +1,12 @@
-import { ResultFail } from '@zenweb/result';
-import { debug } from './utils.js';
-export class TemplateRender {
-    _option;
-    enwrap = false;
-    type;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TemplateRender = void 0;
+const result_1 = require("@zenweb/result");
+const utils_1 = require("./utils");
+class TemplateRender {
     constructor(_option) {
         this._option = _option;
+        this.enwrap = false;
         this.type = _option.type || 'html';
     }
     match(ctx) {
@@ -13,12 +14,12 @@ export class TemplateRender {
         if (opt) {
             // 匹配引擎
             if (opt.engine === this._option.engineName) {
-                debug('matchEngine: %o', this._option.engineName);
+                (0, utils_1.debug)('matchEngine: %o', this._option.engineName);
                 return true;
             }
             // 指定模版
             if (opt.template && this._option.templateAffix && opt.template.endsWith(this._option.templateAffix)) {
-                debug('matchTemplateAffix: %o', this._option.templateAffix);
+                (0, utils_1.debug)('matchTemplateAffix: %o', this._option.templateAffix);
                 return true;
             }
         }
@@ -26,7 +27,7 @@ export class TemplateRender {
         if (this._option.ignorePath) {
             for (const reg of this._option.ignorePath) {
                 if (reg.test(ctx.path)) {
-                    debug('ignorePath: %o', reg);
+                    (0, utils_1.debug)('ignorePath: %o', reg);
                     return false;
                 }
             }
@@ -35,7 +36,7 @@ export class TemplateRender {
         if (this._option.matchPath) {
             for (const reg of this._option.matchPath) {
                 if (reg.test(ctx.path)) {
-                    debug('matchPath: %o', reg);
+                    (0, utils_1.debug)('matchPath: %o', reg);
                     return true;
                 }
             }
@@ -44,16 +45,16 @@ export class TemplateRender {
         if (this._option.matchAccept) {
             const _type = ctx.accepts().some(accept => this._option.matchAccept?.includes(accept));
             if (_type) {
-                debug('matchAccept: %o', _type);
+                (0, utils_1.debug)('matchAccept: %o', _type);
                 return true;
             }
         }
-        return false;
+        return this._option.default || false;
     }
     render(ctx, data) {
         const opt = ctx.templateOption || {};
         let template = opt.template;
-        if (data instanceof ResultFail) {
+        if (data instanceof result_1.ResultFail) {
             data = { fail: data };
             if (opt.failTemplate !== false) {
                 template = opt.failTemplate || this._option.failTemplate || template;
@@ -68,3 +69,4 @@ export class TemplateRender {
         return this._option.engine(template, data);
     }
 }
+exports.TemplateRender = TemplateRender;

package/dist/types.d.ts

@@ -21,6 +21,12 @@ export interface TemplateSetupOption {
      * 匹配 Accept Type 头信息
      */
     matchAccept?: string[];
+    /**
+     * 默认使用
+     * - 设置为 true 的情况下在没有匹配任何规则下默认启用
+     * @default false
+     */
+    default?: boolean;
     /**
      * 模版名后缀
      * - 例如 '.html'

package/dist/types.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils.js

@@ -1,7 +1,44 @@
-import * as path from 'path';
-import { debug as _debug } from '@zenweb/core';
-export const debug = _debug.extend('template');
-export function cwdPath(p) {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.debug = void 0;
+exports.cwdPath = cwdPath;
+const path = __importStar(require("path"));
+const core_1 = require("@zenweb/core");
+exports.debug = core_1.debug.extend('template');
+function cwdPath(p) {
     if (p.startsWith('./')) {
         return path.join(process.cwd(), p.slice(2));
     }

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@zenweb/template",
-  "type": "module",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "zenweb template render module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "rimraf dist && tsc",
+    "build": "rimraf dist && tsc -p tsconfig.build.json",
     "prepack": "npm run build",
-    "dev": "cd example && node --env-file=.env --import tsx/esm app.ts"
+    "dev": "cd example && node --env-file=.env -r ts-node/register app.ts"
   },
   "files": [
     "dist"
@@ -25,17 +24,17 @@
   "license": "MIT",
   "homepage": "https://zenweb.node.ltd",
   "devDependencies": {
-    "@types/node": "^20.10.6",
-    "@zenweb/inject": "^5.1.0",
-    "@zenweb/template-handlebars": "^3.0.0",
-    "@zenweb/template-nunjucks": "^3.3.0",
+    "@types/node": "^16.18.126",
+    "@zenweb/inject": "^5.4.0",
+    "@zenweb/template-handlebars": "^4.1.0",
+    "@zenweb/template-nunjucks": "^4.1.0",
     "rimraf": "^4.4.1",
-    "tsx": "^4.19.1",
-    "typescript": "^5.3.3",
-    "zenweb": "^5.1.0"
+    "ts-node": "^10.9.2",
+    "typescript": "^6.0.3",
+    "zenweb": "^6.4.0"
   },
   "dependencies": {
-    "@zenweb/core": "^5.1.0",
-    "@zenweb/result": "^5.0.0"
+    "@zenweb/core": "^5.3.0",
+    "@zenweb/result": "^5.3.0"
   }
 }