@less-is-more/less-js 1.2.15 → 1.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.2.15",
+  "version": "1.2.19",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {
@@ -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

@@ -202,16 +202,26 @@ module.exports = class Db {
     }
   }
 
-  static async sql(sql, values = [], type = this.SQL_TYPE_SELECT, model) {
-    let params = {
+  static async sql(
+    sql,
+    values = [],
+    type = this.SQL_TYPE_SELECT,
+    modelFormat = false
+  ) {
+    const result = await this.getInstance().query(sql, {
       type: type,
       replacements: values,
-    };
-    if (model) {
-      params.model = model;
-      params.mapToModel = true;
-      params.type = Sequelize.QueryTypes.RAW;
+    });
+    if (modelFormat) {
+      return JSON.parse(this._toHump(JSON.stringify(result)));
+    } else {
+      return result;
     }
-    return await this.getInstance().query(sql, params);
+  }
+
+  static _toHump(text) {
+    return text.replace(/\_(\w)/g, (all, letter) => {
+      return letter.toUpperCase();
+    });
   }
 };

package/src/redis.js

@@ -1,43 +1,46 @@
 const redis = require("redis");
-const { promisify } = require("util");
 
 module.exports = class Redis {
-	static #client;
-	static #user;
-	static #password;
-	static #host;
+  static #client;
+  static #user;
+  static #password;
+  static #host;
 
-	static init(host, user, password) {
-		this.#host = host;
-		this.#user = user;
-		this.#password = password;
-	}
+  static init(host, user, password) {
+    this.#host = host;
+    this.#user = user;
+    this.#password = password;
+  }
 
-	static getInstance() {
-		if (!this.#client) {
-			if (this.#host) {
-				this.#client = redis.createClient({
-					host: this.#host,
-					user: this.#user,
-					password: this.#password,
-				});
-			} else {
-				throw new Error("Redis not init");
-			}
-		}
-		return this.#client;
-	}
+  static async getInstance() {
+    if (!this.#client) {
+      if (this.#host) {
+        let params = {
+          socket: { host: this.#host },
+        };
+        if (this.#user) {
+          params.username = this.#user;
+          params.password = this.#password;
+        }
+        this.#client = await redis.createClient(params);
+        await this.#client.connect();
+      } else {
+        throw new Error("Redis not init");
+      }
+    }
+    return this.#client;
+  }
 
-	static async exec(name, ...args) {
-		let client = Redis.getInstance();
-		return await promisify(client[name]).bind(client).apply(undefined, args);
-	}
+  static async exec(name, ...args) {
+    let client = await Redis.getInstance();
+    return await client[name].bind(client).apply(undefined, args);
+  }
 
-	static formatKey(name, params = {}) {
-		let key = name;
-		for (let nKey in params) {
-			key += ":" + nKey + ":" + params[nKey];
-		}
-		return key;
-	}
+  static formatKey(name, params = {}) {
+    let key = name;
+    for (let nKey in params) {
+      key += ":" + nKey + ":" + params[nKey];
+    }
+    return key;
+  }
 };

package/test/test-db.js

@@ -119,7 +119,7 @@ describe("db.js", () => {
         "select * from menu",
         [],
         Db.SQL_TYPE_SELECT,
-        Menu
+        true
       );
       console.log(JSON.stringify(data));
     });