jj.js 1.0.0-rc.1 → 1.0.0-rc.2

package/lib/config.js

@@ -20,7 +20,7 @@ const view = {
     view_folder: 'view', // 模板目录名
     view_depr: '/', // 模版文件名分割符，'/'代表二级目录
     view_ext: '.htm', // 模版后缀
-    view_engine: 'art-template', // 默认模版引擎，字符串或引擎类
+    view_engine: '@yafoo/art-template', // 默认模版引擎，字符串或引擎类
     view_filter: {}, // 模版函数
 }
 

package/lib/loader.js

@@ -1,7 +1,7 @@
 const pt = require('path');
 /** @type {function} */
 // @ts-ignore
-const isClass = require('is-class');
+const isClass = require('./utils/is-class');
 const {isFileSync, isDirSync} = require('./utils/fs');
 
 /**

package/lib/response.js

@@ -101,7 +101,7 @@ class Response extends Context
      * @param {Error} err
      */
     exception(err) {
-        const escapeHtml = require('escape-html');
+        const escapeHtml = require('./utils/escape-html');
         const tplData = parseError(err);
         tplData.msg = escapeHtml(tplData.msg);
         // @ts-ignore

package/lib/router.js

@@ -50,15 +50,15 @@ if (cfg_routes) {
 }
 
 // 注册系统路由
-router.all('/(.*)', async (ctx, next) => {
+router.all('/{*path}', async (ctx, next) => {
     if(ctx._routeMatched) return await next();
 
-    let param = ctx.params[0] ?? '';
+    let param = ctx.params.path ?? '';
     const dotIndex = param.indexOf('.');
     if(~dotIndex) param = param.slice(0, dotIndex);
     try {
         resolveRoute(param, ctx, cfg_app.controller_folder);
-        delete ctx.params[0];
+        delete ctx.params.path;
     } catch (error) {
         if(cfg_app.app_debug) throw error;
         return;

package/lib/types.js

@@ -258,7 +258,7 @@ class TypesGenerator {
      * @returns {Promise<Object<string, NodeInfo>>}
      */
     async getNodeList(dir, ignore = []) {
-        const isClass = require('is-class');
+        const isClass = require('./utils/is-class');
         let files;
         try {
             files = await fsPromises.readdir(dir, {withFileTypes: true});

package/lib/utils/escape-html.js

@@ -0,0 +1,15 @@
+/**
+ * 转义 HTML 特殊字符，防止 XSS 攻击
+ * @param {string} str - 需要转义的字符串
+ * @returns {string} 转义后的字符串
+ */
+function escapeHtml(str) {
+    return String(str)
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;');
+}
+
+module.exports = escapeHtml;

package/lib/utils/is-class.js

@@ -0,0 +1,12 @@
+/**
+ * 判断一个值是否是 ES6 class
+ * @param {*} fn - 需要判断的值
+ * @returns {boolean} 是否是 class
+ */
+function isClass(fn) {
+    if (typeof fn !== 'function') return false;
+    const str = Function.prototype.toString.call(fn);
+    return /^class[\s{]/.test(str);
+}
+
+module.exports = isClass;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj.js",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "description": "A super simple lightweight NodeJS MVC framework（一个超级简单轻量的NodeJS MVC框架）",
   "main": "jj.js",
   "scripts": {
@@ -23,19 +23,17 @@
   },
   "homepage": "https://github.com/yafoo/jj.js#readme",
   "dependencies": {
-    "@koa/router": "^13.1.0",
-    "art-template": "^4.13.2",
-    "escape-html": "^1.0.3",
-    "is-class": "0.0.9",
-    "koa": "^2.16.0",
-    "koa-body": "^6.0.1",
+    "@koa/router": "^15.7.0",
+    "@yafoo/art-template": "^5.1.0",
+    "koa": "^3.2.1",
+    "koa-body": "^8.0.0",
     "koa-static": "^5.0.0",
-    "mongodb": "^6.0.0",
+    "mongodb": "^7.5.0",
     "mysql": "^2.18.1",
-    "sqlite3": "^5.1.7"
+    "sqlite3": "^6.0.1"
   },
   "engines": {
-    "node": ">= 18"
+    "node": ">= 20.19.0"
   },
   "devDependencies": {
     "supertest": "^7.2.2"