mas-server 3.0.41 → 4.0.0-beta.0

package/dist/type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"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"}

package/dist/utils/mas-encrypt.min.d.ts

@@ -0,0 +1,6 @@
+export function encode(t: any, e: any, r?: number): any;
+export function decode(t: any, e: any, r?: number): any;
+export function isJSON(t: any): boolean;
+export function randomInt(t: any, e: any): number;
+export function randomStr(e: any): string;
+//# sourceMappingURL=mas-encrypt.min.d.ts.map

package/dist/utils/mas-encrypt.min.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mas-encrypt.min.d.ts","sourceRoot":"","sources":["../../src/utils/mas-encrypt.min.js"],"names":[],"mappings":"AAAk99C,wDAA+c;AAA/c,wDAA+c;AAAl+C,wCAAiG;AAAA,kDAA8S;AAA9S,0CAA8S"}

package/dist/utils/quickSend.d.ts

@@ -0,0 +1,8 @@
+import type { RequestHandler } from 'express';
+/**
+ * 扩展 Response 对象，添加便捷的返回方法。
+ * 为 Express 中间件，给 res 对象添加 return、reply、success、fail 方法。
+ */
+declare const quickSend: RequestHandler;
+export default quickSend;
+//# sourceMappingURL=quickSend.d.ts.map

package/dist/utils/quickSend.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quickSend.d.ts","sourceRoot":"","sources":["../../src/utils/quickSend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAY,MAAM,SAAS,CAAC;AAExD;;;GAGG;AACH,QAAA,MAAM,SAAS,EAAE,cA+ChB,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/utils/tokenUtils.d.ts

@@ -0,0 +1,54 @@
+/**
+ * 解码加密的 token 字符串
+ * @param token - 需要解码的加密 token 字符串
+ * @param key - 解密密钥，默认为 '8087'
+ * @param layer - 编码层数，默认为 0
+ * @returns 解码后的数据对象，如果解码失败则返回 false
+ */
+declare function decode(token: string, key?: string, layer?: number): any;
+/**
+ * 编码数据为加密的 token 字符串
+ * @param data - 需要编码的数据，可以是对象或字符串
+ * @param key - 加密密钥，默认为 '8087'
+ * @param layer - 编码层数，默认为 0
+ * @returns 编码后的 token 字符串
+ */
+declare function encode(data: any, key?: string, layer?: number): string;
+/**
+ * Token 验证结果类型
+ */
+type TokenValidationResult = {
+    status: 1;
+    data?: any;
+    _permission?: string[];
+    _masTime?: number;
+    [key: string]: any;
+} | {
+    status: 0;
+    msg: string;
+    errorCode: number;
+    token?: any;
+};
+/**
+ * 验证 token
+ * @param param0 token:解密的token,permission:效验的权限，只要有其中一个就可
+ * @param key 解密密钥
+ * @returns 验证结果
+ */
+declare const validToken: ({ token, permission }: {
+    token: any;
+    permission?: string[];
+}, key?: string) => TokenValidationResult;
+/**
+ * 创建 token
+ * @param param0 data:加密的数据,time:过期时间/s(为零则不会过期),permission:权限设置
+ * @param key 加密密钥
+ * @returns 加密后的 token 字符串
+ */
+declare function createToken({ data, time, permission, }?: {
+    data?: any;
+    time?: number;
+    permission?: string[];
+}, key?: string): string;
+export { validToken, createToken, decode, encode };
+//# sourceMappingURL=tokenUtils.d.ts.map

package/dist/utils/tokenUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenUtils.d.ts","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,iBAAS,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,MAAe,EAAE,KAAK,GAAE,MAAU,GAAG,GAAG,CAE3E;AAED;;;;;;GAMG;AACH,iBAAS,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAE,MAAe,EAAE,KAAK,GAAE,MAAU,GAAG,MAAM,CAE1E;AAED;;GAEG;AACH,KAAK,qBAAqB,GACtB;IACE,MAAM,EAAE,CAAC,CAAC;IACV,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,GACD;IACE,MAAM,EAAE,CAAC,CAAC;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CAAC;AAEN;;;;;GAKG;AACH,QAAA,MAAM,UAAU,GACd,uBAA4B;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EACjE,YAAY,KACX,qBA0BF,CAAC;AAEF;;;;;GAKG;AACH,iBAAS,WAAW,CAClB,EACE,IAAW,EACX,IAAQ,EACR,UAAe,GAChB,GAAE;IAAE,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,EAC5D,GAAG,SAAS,GACX,MAAM,CAMR;AAED,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC"}

package/dist/utils/typeFromValidFormat.d.ts

@@ -0,0 +1,69 @@
+/**
+ * 由 `requestFormat`（运行时校验格式）推导出真实的 TypeScript 类型。
+ *
+ * 约定（与 `src/utils/validType.ts` 的运行时校验保持一致）：
+ * - `String / Number / Boolean / Object` 这类构造器表示基础类型
+ * - `'?'` 表示 **可选 string**（字段可缺失/可为 undefined/null；存在时必须是 string）
+ * - `-1` 表示 **可选 number**（字段可缺失/可为 undefined/null；存在时必须是 number）
+ * - `[...]` 表示数组，数组元素格式由数组元素类型决定（推荐只放 1 个元素作为“模板”）
+ * - `{ ... }` 表示对象，key 对应字段格式
+ */
+/** 运行时校验支持的基础构造器描述符 */
+export type BasicTypeDescriptor = StringConstructor | NumberConstructor | BooleanConstructor | ObjectConstructor;
+/**
+ * 可选字段占位符（仅用于 `requestFormat/responseFormat` 的“值”层表达）。
+ *
+ * 使用示例：
+ * ```ts
+ * const _String = '?' as const;
+ * const _Number = -1 as const;
+ * const requestFormat = { name: _String, age: _Number };
+ * ```
+ */
+export type OptionalDescriptor = '?' | -1;
+/**
+ * 运行时校验格式（requestFormat）的 TypeScript 结构。
+ *
+ * 注意：这里是“类型层”定义，用于推导 `req.body` 的类型；运行时仍由 `validType` 校验。
+ */
+export type ValidFormat = BasicTypeDescriptor | OptionalDescriptor | {
+    [key: string]: ValidFormat;
+} | ValidFormat[];
+/** 可选字符串占位符：字段可缺失/undefined/null；存在时必须是 string */
+export declare const _String: "?";
+/** 可选数字占位符：字段可缺失/undefined/null；存在时必须是 number */
+export declare const _Number: -1;
+/**
+ * 将构造器描述符映射为对应的 TypeScript 原始类型。
+ */
+type PrimitiveFromDescriptor<T> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends ObjectConstructor ? Record<string, unknown> : never;
+/**
+ * 将可选占位符映射为对应的 TypeScript 原始类型（存在时的类型）。
+ */
+type PrimitiveFromOptionalDescriptor<T> = T extends '?' ? string : T extends -1 ? number : never;
+/**
+ * 从对象格式中计算“可选字段 key 集合”。
+ */
+type OptionalKeys<T> = T extends object ? {
+    [K in keyof T]-?: T[K] extends OptionalDescriptor ? K : T[K] extends readonly (infer U)[] ? U extends OptionalDescriptor ? K : never : never;
+}[keyof T] : never;
+/**
+ * 从对象格式中计算“必填字段 key 集合”。
+ */
+type RequiredKeys<T> = Exclude<keyof T, OptionalKeys<T>>;
+/**
+ * 从 `requestFormat` 推导 body 类型：
+ * - 构造器 -> 基础类型
+ * - 可选占位符 -> 基础类型（存在时）
+ * - 数组 -> 元素类型数组
+ * - 对象 -> 递归映射字段
+ * - 其它 -> unknown
+ */
+export type TypeFromValidFormat<T> = T extends BasicTypeDescriptor ? PrimitiveFromDescriptor<T> : T extends OptionalDescriptor ? PrimitiveFromOptionalDescriptor<T> : T extends readonly (infer U)[] ? TypeFromValidFormat<U>[] : T extends object ? // 对象字段：占位符字段推导为可选属性，其余字段为必填属性
+{
+    [K in RequiredKeys<T>]: TypeFromValidFormat<T[K]>;
+} & {
+    [K in OptionalKeys<T>]?: TypeFromValidFormat<T[K]>;
+} : unknown;
+export {};
+//# sourceMappingURL=typeFromValidFormat.d.ts.map

package/dist/utils/typeFromValidFormat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typeFromValidFormat.d.ts","sourceRoot":"","sources":["../../src/utils/typeFromValidFormat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,uBAAuB;AACvB,MAAM,MAAM,mBAAmB,GAC3B,iBAAiB,GACjB,iBAAiB,GACjB,kBAAkB,GAClB,iBAAiB,CAAC;AAEtB;;;;;;;;;GASG;AACH,MAAM,MAAM,kBAAkB,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,WAAW,GACnB,mBAAmB,GACnB,kBAAkB,GAClB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,GAC9B,WAAW,EAAE,CAAC;AAElB,kDAAkD;AAClD,eAAO,MAAM,OAAO,EAAG,GAAY,CAAC;AACpC,iDAAiD;AACjD,eAAO,MAAM,OAAO,EAAG,CAAC,CAAU,CAAC;AAEnC;;GAEG;AACH,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,iBAAiB,GACzD,MAAM,GACN,CAAC,SAAS,iBAAiB,GACzB,MAAM,GACN,CAAC,SAAS,kBAAkB,GAC1B,OAAO,GACP,CAAC,SAAS,iBAAiB,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,KAAK,CAAC;AAEhB;;GAEG;AACH,KAAK,+BAA+B,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,GACnD,MAAM,GACN,CAAC,SAAS,CAAC,CAAC,GACV,MAAM,GACN,KAAK,CAAC;AAEZ;;GAEG;AACH,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACnC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,kBAAkB,GAC7C,CAAC,GAED,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAC/B,CAAC,SAAS,kBAAkB,GAC1B,CAAC,GACD,KAAK,GACP,KAAK;CACZ,CAAC,MAAM,CAAC,CAAC,GACV,KAAK,CAAC;AAEV;;GAEG;AACH,KAAK,YAAY,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,mBAAmB,GAC9D,uBAAuB,CAAC,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,+BAA+B,CAAC,CAAC,CAAC,GAClC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAC5B,mBAAmB,CAAC,CAAC,CAAC,EAAE,GACxB,CAAC,SAAS,MAAM,GAEd,AADA,8BAA8B;AAC9B;KAAG,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG;KACrD,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnD,GACD,OAAO,CAAC"}

package/dist/utils/validType.d.ts

@@ -0,0 +1,17 @@
+import type { ValidFormat } from './typeFromValidFormat';
+/**
+ * 获取值的“运行时类型标签”（与 `Object.prototype.toString` 一致）。
+ *
+ * @param value - 任意值
+ * @returns 小写类型字符串，例如：`"string" | "number" | "object" | "array" | "function"`
+ */
+export declare function getType(value: unknown): string;
+/**
+ * 校验值是否满足 `typeMapping/requestFormat` 所描述的格式。
+ *
+ * @param value - 待校验值（通常是 req.body 或其子字段）
+ * @param format - 格式描述（`String/Number/...`、对象、数组）
+ * @param strict - strict=true 时对象不允许出现多余字段；strict=false 允许多余字段
+ */
+export default function validType(value: unknown, format: ValidFormat, strict?: boolean): boolean;
+//# sourceMappingURL=validType.d.ts.map

package/dist/utils/validType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validType.d.ts","sourceRoot":"","sources":["../../src/utils/validType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE9C;AA8ID;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,WAAW,EACnB,MAAM,GAAE,OAAe,GACtB,OAAO,CAqBT"}

package/package.json

@@ -1,53 +1,50 @@
 {
   "name": "mas-server",
-  "version": "3.0.41",
-  "description": "一款基于express面向中小型项目的后端框架",
-  "main": "dist/index.js",
-  "typings": "src/index.ts",
+  "version": "4.0.0-beta.0",
+  "description": "",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "private": false,
   "scripts": {
-    "test": "npx ts-node ./test/scripts/beforeCreated.ts -end && npx ts-node ./test/scripts/run.ts",
-    "testmon": "npx nodemon ./test/scripts/run.ts",
-    "testTS": "npx nodemon ./test/test.ts",
-    "createSql": "npx ts-node ./test/scripts/createSqlForm.ts",
-    "createApi": "npx ts-node ./test/scripts/createApiFile.ts",
-    "createApis": "npx ts-node ./test/scripts/createApis.ts",
-    "init": "npx nodemon ./test/scripts/beforeCreated.ts -end",
-    "gsft": "npx nodemon ./test/scripts/getSqlFormType.ts",
-    "build": "node ./beforebuild.js && tsc --project ./tsconfig-build.json",
-    "sync": "npm run build && npm publish --registry=https://registry.npmjs.org && cnpm sync mas-server && explorer \"https://npmmirror.com/package/mas-server\""
+    "build": "bun run build:js && bun run build:types",
+    "build:js": "bun build src/index.ts --outdir ./dist --target node --format esm --minify --external express --external morgan --external rotating-file-stream --external ansi-colors --external moment",
+    "build:types": "tsc --project tsconfig.build.json",
+    "prepublishOnly": "bun run build",
+    "debug": "bun run --watch debug.ts",
+    "testServer": "bun run --watch test/src/main.ts",
+    "sync": "bun run build && npm publish --registry=https://registry.npmjs.org && cnpm sync mas-server && explorer \"https://npmmirror.com/package/mas-server\""
   },
-  "keywords": [],
-  "author": "tingxi8087",
-  "license": "ISC",
-  "dependencies": {
-    "@types/express": "^4.17.21",
-    "ansi-colors": "^4.1.3",
-    "axios": "^1.3.6",
-    "cors": "^2.8.5",
-    "express": "^4.18.2",
-    "express-ip": "^1.0.4",
-    "express-rate-limit": "^7.1.4",
-    "fs-extra": "^11.1.1",
-    "glob": "^10.3.1",
-    "masmysql": "^2.0.56",
-    "module-alias": "^2.2.2",
-    "moment": "^2.29.4",
-    "moment-timezone": "^0.5.44",
-    "morgan": "^1.10.0",
-    "mysql": "^2.18.1",
-    "nodemon": "^2.0.22",
-    "rotating-file-stream": "^3.1.1",
-    "ts-node": "^10.9.1",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^5.0.4"
+  "devDependencies": {
+    "@types/bun": "latest",
+    "@types/morgan": "^1.9.10",
+    "@typescript-eslint/eslint-plugin": "^8.52.0",
+    "@typescript-eslint/parser": "^8.52.0",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.4",
+    "prettier": "^3.7.4",
+    "typescript": "^5",
+    "typescript-eslint": "^8.51.0"
   },
-  "_moduleAliases": {
-    "@": "src/",
-    "@@": "."
+  "peerDependencies": {
+    "typescript": "^5"
   },
-  "devDependencies": {
-    "@types/cors": "^2.8.13",
-    "@types/express": "^4.17.17",
-    "@types/moment": "^2.13.0"
+  "dependencies": {
+    "@types/express": "^5.0.6",
+    "ansi-colors": "^4.1.3",
+    "express": "^5.2.1",
+    "moment": "^2.30.1",
+    "morgan": "^1.10.1",
+    "rotating-file-stream": "^3.2.7"
   }
-}
+}

package/.temp/getRouteByApiSrc.ts

@@ -1,55 +0,0 @@
-import readApi from "./readApi";
-import c from "ansi-colors";
-import { ApiConfigType } from "../typings";
-
-export default function getRouteByApiSrc(
-  apiSrc,
-  apiConfig: ApiConfigType,
-  apiKey: { [key: string]: string }
-) {
-  const routerArr = readApi(apiSrc, "api");
-  const newApiConfig = {};
-  apiConfig = { ...apiConfig };
-  let isAdd = false;
-  for (let v of routerArr) {
-    if (!apiConfig[v]) {
-      isAdd = true;
-      console.info(c.green(`新增接口 ${v}`));
-      newApiConfig[v] = {
-        name: "新建接口",
-        methods: "all",
-        des: "",
-        validFormat: null,
-      };
-    } else {
-      newApiConfig[v] = apiConfig[v];
-      delete apiConfig[v];
-    }
-  }
-  if (Object.keys(apiConfig).length != 0) {
-    console.info(c.red(`删除接口 ${Object.keys(apiConfig)}`));
-    isAdd = true;
-  }
-  // 接口翻译
-  let newApiConfigArr = [];
-
-  for (let item in newApiConfig) {
-    for (let v of item.slice(1).split("/")) {
-      newApiConfigArr.push(v);
-    }
-  }
-
-  newApiConfigArr = [...new Set(newApiConfigArr)];
-  apiKey = { ...apiKey };
-  const newApiKey = {};
-
-  for (let v of newApiConfigArr) {
-    if (apiKey[v] === undefined) {
-      isAdd = true;
-      newApiKey[v] = "";
-    } else {
-      newApiKey[v] = apiKey[v];
-    }
-  }
-  return { newApiConfig, isAdd, newApiConfigArr, newApiKey };
-}

package/.temp/merge/a.ts

@@ -1,4 +0,0 @@
-import * as fs from "fs";
-import path from "path";
-fs.writeFileSync(path.join(__dirname, "as.ts"), `export default{name:"test"}`);
-export {};

package/.temp/merge/as.ts

@@ -1 +0,0 @@
-export default{name:"test"}

package/.temp/merge/b.ts

@@ -1,3 +0,0 @@
-import test from "./as";
-console.log(test);
-export {};

package/.temp/merge/i.js

@@ -1,103 +0,0 @@
-const express = require("express");
-const formidable = require('express-formidable');
-const cors = require('cors');
-const fs = require('fs');
-const path = require('path');
-const { tip } = require("masutils");
-const configSchema = require('./config/config.schema');
-const state = require("./state");
-const beforeIndex = require('./utils/beforeCreate');
-const masmysql = require('masmysql');
-const { sql, setSqlConfig, getSqlFormKey } = require('masmysql');
-const createSqlForm = require("./utils/createSqlForm");
-const getDir = require("./utils/getDir");
-const createApi = require("./utils/createApi");
-const createApiFile = require("./utils/createApiFile");
-const createForm = (dirname) => {
-  const config = require(path.join(dirname, "/config", "config.js"));
-  const form = require(path.join(dirname, "/config", "/sqlform.config.js"));
-  createSqlForm(config.sql, form);
-};
-const createCode = (dirname) => {
-  createApi(dirname);
-};
-const createApis = (dirname) => {
-  createApiFile(dirname);
-};
-let token = null;
-const getApp = (dirname) => {
-  const app = express();
-  const config = require(path.join(dirname, "/config", "config.js"));
-  state.config = config;
-  state.dirname = dirname;
-  // 工具包
-  const logs = require("./utils/logs");
-  const quickSend = require('./utils/quickSend');
-  token = require("./utils/token");
-  const DataVerified = require("./utils/DataVerified");
-  const masDoc = require("./utils/masDoc");
-  const apiConfig = require(path.join(dirname, "/config", "/api.config.json"));
-  // 处理数据库
-  config.useSql && setSqlConfig(config.sql);
-  config.useSql && sql.init();
-  config.useSql && getSqlFormKey(dirname + "/src/$form.js");
-  // 处理express
-  config.cors && app.use(cors());
-  app.use('/public', express.static(path.join(dirname, "/public")));
-  config.apidoc && app.use('/masPublic', express.static(path.join(__dirname, "/public")));;
-  app.use(formidable());
-  app.use(quickSend);
-  config.logs.open && app.use(require('express-ip')().getIpInfoMiddleware);
-  config.logs.open && app.use(logs);
-  config.token.open && app.use(token._main);
-  app.use(DataVerified);
-  masDoc(app, config);
-  getDir('/api').map(item => {
-    let model = require(dirname + `/src/${item}`);
-    if (typeof model === "function") {
-      if (apiConfig[item] && apiConfig[item].methods) {
-        app[apiConfig[item].methods](item, model);
-      } else {
-        app.all(item, model);
-      }
-    }
-  });
-  app.all('/', async (req, res) => {
-    const index = require(path.join(dirname, "/src/api", "index.js"));
-    index(req, res);
-  });
-  app.all('*', (req, res) => {
-    res.return(404, 0, 404);
-  });
-  setTimeout(() => {
-    try {
-      require(path.join(dirname + '/src/debug.js'));
-    } catch (error) {
-      tip("debug.js报错！！！");
-      tip(error);
-    }
-  }, 1000);
-  return app;
-};
-/**
- * @desc: 生成token
- * @param {*} data 要放入token的数据
- * @param {string} permission 角色权限
- * @param {number} time token过期时间，设置此项传入数据必须为json数据，单位为s，默认为0，不过期
- * @return {*}
- */
-function createToken(data, permission, time) {
-  return token.createToken(data, time, permission, state.config);
-}
-module.exports = {
-  getApp,
-  configSchema: configSchema.configSchema,
-  $sqlForm: configSchema.$sqlForm,
-  beforeIndex,
-  masmysql,
-  createToken,
-  sql,
-  createForm,
-  createCode,
-  createApis
-};

package/.temp/merge/test.ts

@@ -1,2 +0,0 @@
-import "./a";
-import "./b";

package/.temp/merge/validType copy.ts

@@ -1,149 +0,0 @@
-type BasicTypeDescriptor =
-  | StringConstructor
-  | NumberConstructor
-  | BooleanConstructor
-  | ObjectConstructor;
-type TypeDescriptor = BasicTypeDescriptor | Array<any>;
-
-interface TypeMapping {
-  [key: string]:
-    | TypeDescriptor
-    | TypeMapping
-    | Array<TypeDescriptor | TypeMapping>;
-}
-import { getType } from "../src/utils/masUtils";
-function getTypeName(descriptor: TypeDescriptor): string {
-  if (Array.isArray(descriptor)) {
-    return "array";
-  } else {
-    return (descriptor as BasicTypeDescriptor).name.toLowerCase();
-  }
-}
-
-function validTypeObj(obj: any, typeMapping: TypeMapping): boolean {
-  for (const key in typeMapping) {
-    if (!obj.hasOwnProperty(key)) {
-      return false;
-    }
-
-    const targetType = typeMapping[key];
-
-    const objValue = obj[key];
-    if (Array.isArray(targetType)) {
-      if (!Array.isArray(objValue)) {
-        return false;
-      }
-
-      const arrayElementType = targetType[0];
-
-      for (const element of objValue) {
-        if (typeof arrayElementType === "object") {
-          if (!validType(element, arrayElementType as TypeMapping)) {
-            return false;
-          }
-        } else {
-          if (
-            typeof element !== getTypeName(arrayElementType as TypeDescriptor)
-          ) {
-            return false;
-          }
-        }
-      }
-    } else if (typeof targetType === "object") {
-      if (
-        typeof objValue !== "object" ||
-        Array.isArray(objValue) ||
-        !validType(objValue, targetType as TypeMapping)
-      ) {
-        return false;
-      }
-    } else {
-      if (typeof objValue !== getTypeName(targetType as TypeDescriptor)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-function validTypeObjStrict(obj: any, typeMapping: TypeMapping): boolean {
-  if (getType(typeMapping) == "object") {
-    if (getType(obj) != "object") return false;
-    if (Object.keys(obj).length != Object.keys(typeMapping).length) {
-      return false;
-    }
-  }
-
-  for (const key in typeMapping) {
-    if (!obj?.hasOwnProperty(key)) {
-      return false;
-    }
-
-    const targetType = typeMapping[key];
-    const objValue = obj[key];
-
-    if (Array.isArray(targetType)) {
-      if (!Array.isArray(objValue)) {
-        return false;
-      }
-
-      const arrayElementType = targetType[0];
-
-      for (const element of objValue) {
-        if (typeof arrayElementType === "object") {
-          if (
-            !validType(element, arrayElementType as TypeMapping) ||
-            Object.keys(element).length !==
-              Object.keys(arrayElementType as TypeMapping).length
-          ) {
-            return false;
-          }
-        } else {
-          if (
-            typeof element !== getTypeName(arrayElementType as TypeDescriptor)
-          ) {
-            return false;
-          }
-        }
-      }
-    } else if (typeof targetType === "object") {
-      if (
-        typeof objValue !== "object" ||
-        Array.isArray(objValue) ||
-        !validType(objValue, targetType as TypeMapping) ||
-        Object.keys(objValue).length !==
-          Object.keys(targetType as TypeMapping).length
-      ) {
-        return false;
-      }
-    } else {
-      if (typeof objValue !== getTypeName(targetType as TypeDescriptor)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-export default function validType(
-  obj: any,
-  typeMapping: TypeMapping | TypeDescriptor,
-  strict: boolean = false
-): boolean {
-  if (getType(typeMapping) == "function") {
-    const typeT = typeMapping.toString().split(" ")[1].trimEnd();
-    if (typeT == "Boolean()") {
-      return getType(obj) == "boolean";
-    } else if (typeT == "Number()") {
-      return getType(obj) == "number";
-    } else if (typeT == "String()") {
-      return getType(obj) == "string";
-    }
-  } else {
-    return strict
-      ? validTypeObjStrict(obj, typeMapping as any)
-      : validTypeObj(obj, typeMapping as any);
-  }
-  return false;
-}