mas-server 2.0.3 → 2.0.5

package/dist/test/src/api/example/validReqData.js

@@ -0,0 +1,98 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const masState_1 = __importDefault(require("@@/test/src/masState"));
+exports.config = {
+    name: "数据效验及响应示例接口",
+    methods: "post",
+    validFormat: {
+        name: String,
+        age: Number,
+        grade: [{ name: String, score: Number }],
+        desc: String,
+        family: {
+            mother: {
+                name: String,
+                age: Number,
+            },
+            fahter: {
+                name: String,
+                age: Number,
+            },
+        },
+    },
+    // 效验严格模式，默认不开启，开启则不能携带额外参数
+    validFormatStrict: false,
+    // 接口文档的请求示例
+    example: {
+        extra: "这是一个额外参数，如果开启严格模式且带上这个参数将会不通过效验",
+        name: "小蔡",
+        age: 18,
+        grade: [{ name: "篮球", score: 99 }],
+        desc: "两年半",
+        family: {
+            mother: {
+                name: "母坤",
+                age: 40,
+            },
+            fahter: {
+                name: "公坤",
+                age: 40,
+            },
+        },
+    },
+    // 响应示例
+    resExample: {
+        msg: "",
+        status: 1,
+        data: "hello!练习两年半的程序员",
+    },
+    validFormatDes: [
+        {
+            name: "extra",
+            des: "额外的参数",
+            type: String,
+        },
+        {
+            name: "name",
+            des: "姓名",
+        },
+        {
+            name: "age",
+            des: "年龄",
+        },
+        {
+            name: "grade",
+            des: "成绩",
+        },
+        {
+            name: "family",
+            des: "家庭情况",
+        },
+    ],
+    des: "详细数据效验及响应示例接口",
+    header: [
+        {
+            name: "boom",
+            type: String,
+            des: "一个可不传的请求头参数",
+            optional: true,
+        },
+    ],
+};
+exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const { sql } = masState_1.default;
+    res.return("hello!练习两年半的程序员");
+});

package/dist/test/src/api/index.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const masState_1 = __importDefault(require("../masState"));
+exports.config = {
+    name: "默认接口",
+    methods: "all",
+};
+exports.default = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const { sql } = masState_1.default;
+    res.return("hello mas-server!");
+});

package/dist/test/src/debug.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const masState_1 = __importDefault(require("./masState"));
+const { sql } = masState_1.default;
+if (sql && Number.isInteger(sql.debugMode)) {
+    sql.debugMode = 2;
+}

package/dist/test/src/masState.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const masState = {};
+exports.default = masState;

package/dist/test/src/sql/selectStudent.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectStudent = void 0;
+const index_1 = require("@/index");
+const selectStudent = (id) => {
+    const Tof = index_1.massql.escapeId;
+    const Tok = index_1.massql.escape;
+    return `SELECT * FROM ${Tof("student")} where id = ${Tok(id)}`;
+};
+exports.selectStudent = selectStudent;

package/dist/test/src/sqlform.json

@@ -0,0 +1 @@
+{ "student": ["age", "create_time", "des", "id", "is_delete", "name", "update_time", "@!student"], "teacher": ["age", "create_time", "id", "is_delete", "name", "sex", "update_time", "@!teacher"] }

package/dist/test/test.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("module-alias/register");

package/dist/utils/apiDoc.js

@@ -8,9 +8,24 @@ exports.default = (app) => {
         }
         return value;
     });
-    // console.log(state);
+    const newRouter = JSON.parse(router);
+    // 有的描述没有类型，尝试从validFormat里取
+    for (const key in newRouter) {
+        const item = newRouter[key];
+        if (item.validFormat && item.validFormatDes) {
+            for (const validFormatDesItem of item.validFormatDes) {
+                if (!validFormatDesItem.type &&
+                    item.validFormat[validFormatDesItem.name]) {
+                    validFormatDesItem.type = item.validFormat[validFormatDesItem.name];
+                }
+                else if (!validFormatDesItem.type) {
+                    validFormatDesItem.type = "String";
+                }
+            }
+        }
+    }
     app.post("/apidoc/router", (req, res) => {
-        res.return(JSON.parse(router));
+        res.return(newRouter);
     });
     app.post("/apidoc/cn", (req, res) => {
         res.return(state_1.state.apiCN);

package/dist/utils/createRouter.js

@@ -0,0 +1,51 @@
+"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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const state_1 = require("@/state");
+const path_1 = __importDefault(require("path"));
+const fs = __importStar(require("fs"));
+const ansi_colors_1 = __importDefault(require("ansi-colors"));
+function createRouter(app) {
+    const { Router, DIRNAME } = state_1.state;
+    // 遍历api路由
+    for (const item in Router) {
+        let isExist = fs.existsSync(path_1.default.join(DIRNAME, "src", item) + ".ts");
+        if (!isExist) {
+            console.info(ansi_colors_1.default.red(`${item} not found`));
+            continue;
+        }
+        const apiFunc = require(path_1.default.join(DIRNAME, "src", item)).default;
+        if (!apiFunc) {
+            console.info(ansi_colors_1.default.yellow(`${item} 没有导出函数，已跳过..`));
+        }
+        else {
+            apiFunc && app[Router[item].methods](item, apiFunc);
+        }
+    }
+}
+exports.default = createRouter;

package/dist/utils/getRouterInfo.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const state_1 = require("@/state");
+const readApi_1 = __importDefault(require("./readApi"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const ansi_colors_1 = __importDefault(require("ansi-colors"));
+function getRouterInfo(apiDir, defaullConfigDir) {
+    const apiConfig = {};
+    const { DIRNAME } = state_1.state;
+    const routerDir = (0, readApi_1.default)(apiDir, "api");
+    const defaullConfig = require(defaullConfigDir).default;
+    // 遍历api路由
+    for (const item of routerDir) {
+        let isExist = fs_1.default.existsSync(path_1.default.join(DIRNAME, "src", item) + ".ts");
+        if (!isExist) {
+            console.info(ansi_colors_1.default.red(`${item} not found`));
+            continue;
+        }
+        const apiItemConfig = require(path_1.default.join(DIRNAME, "src", item)).config;
+        apiConfig[item] = apiItemConfig || defaullConfig;
+        // if (!apiFunc) {
+        //   console.info(c.yellow(`${item} 没有导出函数，已跳过..`));
+        // } else {
+        //   apiFunc && app[Router[item].methods](item, apiFunc);
+        // }
+    }
+    state_1.state.Router = apiConfig;
+    return apiConfig;
+}
+exports.default = getRouterInfo;

package/dist/utils/validRouteData.js

@@ -16,7 +16,7 @@ exports.default = (req, res, next) => {
         if (routerObj.header && routerObj.header.length != 0) {
             const headerObj = {};
             routerObj.header.forEach((item) => {
-                headerObj[item.name] = item.type;
+                !item.optional && (headerObj[item.name] = item.type);
             });
             if (!(0, validType_1.default)(req.headers, headerObj)) {
                 return res.return("error headers format!", 0, 400);

package/dist/utils/validToken.js

@@ -9,7 +9,7 @@ exports.default = (req, res, next) => {
     if ((0, masUtils_1.getType)(r === null || r === void 0 ? void 0 : r.permission) == "array") {
         const token = req.headers[tokenConfig.headerParams];
         if (!token) {
-            return res.return("缺少重要参数", 0);
+            return res.return("缺少重要参数", 0, 400);
         }
         let vt = (0, __1.validToken)({ token, permission: r.permission }, tokenConfig.pwd);
         if (vt.status === 0) {

package/dist/utils/validType.js

@@ -82,20 +82,3 @@ function validType(obj, typeMapping, strict = false) {
         : validTypeObj(obj, typeMapping);
 }
 exports.default = validType;
-// let res = validType(
-//   { name: "2", arr: [1] },
-//   { name: String, arr: [Number] },
-//   true
-// [
-//   { name: "s", age: "" },
-//   { names: "s", age: "" },
-// ],
-// { name: "11", age: 1, obj: { a: "1", b: 1 } },
-// String,
-// Boolean,
-// { name: String, age: Number, obj: { a: String, b: Number } }
-// [{ name: String }]
-// );
-// console.log(res);
-// console.log(getType(null)); //"null"
-// console.log(getType(undefined)); //"undefined"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mas-server",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "一款基于express面向中小型项目的后端框架",
   "main": "dist/index.js",
   "typings": "src/index.ts",
@@ -14,8 +14,8 @@
     "createApis": "npx ts-node ./test/scripts/createApis.ts",
     "init": "npx nodemon ./test/scripts/beforeCreated.ts -end",
     "gsft": "npx nodemon ./test/scripts/getSqlFormType.ts",
-    "build":"tsc",
-    "publish": "tsc && npm publish && cnpm sync cnpmcore"
+    "build": "tsc --project ./tsconfig-build.json",
+    "sync": "npm run build && npm publish && cnpm sync mas-server && explorer \"https://npmmirror.com/package/mas-server\""
   },
   "keywords": [],
   "author": "tingxi8087",
@@ -30,7 +30,7 @@
     "fs-extra": "^11.1.1",
     "glob": "^10.3.1",
     "mas-encrypt": "^1.0.0",
-    "masmysql": "^2.0.4",
+    "masmysql": "^2.0.53",
     "module-alias": "^2.2.2",
     "moment": "^2.29.4",
     "mysql": "^2.18.1",
@@ -48,4 +48,4 @@
     "@types/express": "^4.17.17",
     "@types/moment": "^2.13.0"
   }
-}
+}

package/{dist/apiDoc/assets/empty-907982e4.js → src/apiDoc/assets/empty-a6de4920.js}

@@ -1 +1 @@
-import{_ as e}from"./index-b56e6bc6.js";const r={};function t(c,n){return null}const o=e(r,[["render",t]]);export{o as default};
+import{_ as e}from"./index-f9ab4187.js";const r={};function t(c,n){return null}const o=e(r,[["render",t]]);export{o as default};