@less-is-more/less-js 1.2.12 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.2.12",
+  "version": "1.2.16",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/lim/less-js.git"
+    "url": "https://gitee.com/shengapp/lim-js"
   },
   "author": "Less Is More",
   "license": "MIT",
@@ -20,20 +20,20 @@
     "@alicloud/pop-core": "^1.7.10",
     "ejs": "^3.1.6",
     "fs-extra": "^10.0.0",
-    "inquirer": "^8.1.2",
+    "inquirer": "^8.2.0",
     "multiparty": "^4.2.2",
-    "mysql2": "^2.2.5",
-    "pg-hstore": "^2.3.3",
+    "mysql2": "^2.3.3",
+    "pg-hstore": "^2.3.4",
     "querystring": "^0.2.1",
-    "redis": "^3.1.2",
-    "sequelize": "^6.6.2",
-    "validator": "^13.6.0"
+    "redis": "^4.0.1",
+    "sequelize": "^6.13.0",
+    "validator": "^13.7.0"
   },
   "devDependencies": {
     "body": "^5.1.0",
-    "mocha": "^8.3.2",
-    "webpack": "^5.35.1",
-    "webpack-cli": "^4.6.0",
+    "mocha": "^9.1.3",
+    "webpack": "^5.66.0",
+    "webpack-cli": "^4.9.1",
     "webpack-node-externals": "^3.0.0"
   }
 }

package/src/db.js

@@ -102,7 +102,7 @@ module.exports = class Db {
         await this.add(model, nNewData);
       } else {
         let needUpdate = false;
-        if ( compareColumn.length > 0) {
+        if (compareColumn.length > 0) {
           const nOldData = oldData[nOldIndex];
           for (let nColumn of compareColumn) {
             if (nOldData[nColumn] !== nNewData[nColumn]) {
@@ -164,7 +164,7 @@ module.exports = class Db {
    * @param {*} attributes 只返回属性
    * @returns
    */
-   static async findAll(
+  static async findAll(
     model,
     params = {},
     order = [["id", "desc"]],
@@ -202,10 +202,26 @@ module.exports = class Db {
     }
   }
 
-  static async sql(sql, values = [], type = this.SQL_TYPE_SELECT) {
-    return await this.getInstance().query(sql, {
+  static async sql(
+    sql,
+    values = [],
+    type = this.SQL_TYPE_SELECT,
+    modelFormat = false
+  ) {
+    const result = await this.getInstance().query(sql, {
       type: type,
       replacements: values,
     });
+    if (modelFormat) {
+      return JSON.parse(this._toHump(JSON.stringify(result)));
+    } else {
+      return result;
+    }
+  }
+
+  static _toHump(text) {
+    return text.replace(/\_(\w)/g, (all, letter) => {
+      return letter.toUpperCase();
+    });
   }
 };

package/src/router.js

@@ -53,8 +53,7 @@ module.exports = class Router {
   }
 
   static _getPath(req) {
-    console.log("method: " + req.method);
-    console.log("path: " + req.path);
+    console.log("path:", req.method, req.path);
     const paths = req.path.split("/");
     const className = paths.length > 2 ? "/" + paths[paths.length - 2] : "/";
     const methodName = paths[paths.length - 1];
@@ -73,8 +72,8 @@ module.exports = class Router {
     if (req.method == "POST") {
       if (isFile) {
         await this._getFile(req);
-        console.log("params", req.params);
-        console.log("files", req.files);
+        console.log("params:", req.params);
+        console.log("files:", req.files);
       } else {
         const data = await promisify(body)(req);
         console.log("body: " + decodeURIComponent(data));
@@ -106,11 +105,14 @@ module.exports = class Router {
   static _handleReturn(result, res) {
     if (!Param.isBlank(result)) {
       if (result instanceof Ret) {
+        console.log("return:", result.toString());
         res.send(result.toString());
       } else {
         if (typeof result === "string") {
+          console.log("return:", result);
           res.send(result);
         } else {
+          console.log("return:", JSON.stringify(result));
           res.send(JSON.stringify(result));
         }
       }

package/test/test-db.js

@@ -114,6 +114,15 @@ describe("db.js", () => {
       let data = await Db.sql("select * from menu where id=?", [1]);
       console.log(data);
     });
+    it("to model", async () => {
+      let data = await Db.sql(
+        "select * from menu",
+        [],
+        Db.SQL_TYPE_SELECT,
+        true
+      );
+      console.log(JSON.stringify(data));
+    });
     it("insert", async () => {
       let data = await Db.sql(
         "insert into menu (name) values(?)",
@@ -177,5 +186,5 @@ describe("db.js", () => {
       console.log(data);
       assert(data.length > 0, "no data");
     });
-  })
+  });
 });