mas-server 3.0.2 → 3.0.3

package/.temp/merge/a.ts

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

package/.temp/merge/b.ts

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

package/.temp/merge/i.js

@@ -1,103 +1,103 @@
-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
+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 +1,2 @@
-import "./a";
-import "./b";
+import "./a";
+import "./b";

package/.temp/merge/validType copy.ts

@@ -1,149 +1,149 @@
-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;
-}
+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;
+}