evaengine 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evaengine",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "EvaEngine for Node.js, a micro service development engine",
   "license": "MIT",
   "type": "module",

package/src/entities/index.js

@@ -22,7 +22,7 @@ Sequelize.prototype.validateIsUnique = (col, msg) => {
         .keys(schema)
         .filter(field => schema[field].primaryKey)
         .forEach((pk) => {
-          conditions.where[pk] = { $ne: self[pk] };
+          conditions.where[pk] = { [Sequelize.Op.ne]: self[pk] };
         });
     }).then(() =>
       self.Model.count(conditions).then((found) => {

package/src/middlewares/view_cache.js

@@ -1,6 +1,5 @@
 import constitute from 'constitute';
 import crypto from 'crypto';
-import util from 'util';
 import moment from 'moment-timezone';
 import Logger from '../services/logger.js';
 import Cache from '../services/cache.js';
@@ -65,7 +64,7 @@ export const requestToCacheKey = (req, hashStrategy) => {
  */
 function ViewCacheMiddleware(cache, logger) {
   return (options = {}) => {
-    if (!util.isObject(options)) {
+    if (options === null || typeof options !== 'object') {
       options = {
         ttl: options
       };

package/src/swagger/index.js

@@ -433,7 +433,8 @@ export class ExSwagger {
       const source = await fs.readFileSync(file);
       try {
         acorn.parse(source, {
-          ecmaVersion: 9,
+          ecmaVersion: 'latest',
+          sourceType: 'module',
           allowImportExportEverywhere: true,
           onComment: comments
         });

package/src/utils/smart_query.js

@@ -1,6 +1,16 @@
 import moment from 'moment-timezone';
+import { Op } from 'sequelize';
 import { InvalidArgumentException } from '../exceptions/index.js';
 
+const OPERATORS = {
+  $eq: Op.eq,
+  $like: Op.like,
+  $in: Op.in,
+  $notIn: Op.notIn,
+  $gte: Op.gte,
+  $lte: Op.lte
+};
+
 /**
  * 自动根据 req.query 生成 sequelize 查询条件, 自动判断参数清单中是否有值
  */
@@ -265,7 +275,7 @@ export default class SmartQuery {
       criteria.order = this.order;
     }
 
-    if (this.where instanceof Object && this.where.length > 0) {
+    if (Object.keys(this.where).length > 0) {
       criteria.where = this.where;
     }
 
@@ -311,7 +321,7 @@ export default class SmartQuery {
     if (!Object.keys(this.where).includes(filedName)) {
       this.where[filedName] = {};
     }
-    this.where[filedName][predicate] = value;
+    this.where[filedName][OPERATORS[predicate] || predicate] = value;
   }
 
   /**