@waline/vercel 1.18.9 → 1.19.0

package/src/service/storage/leancloud.js

@@ -15,6 +15,7 @@ if (LEAN_ID && LEAN_KEY && LEAN_MASTER_KEY) {
 module.exports = class extends Base {
   parseWhere(className, where) {
     const instance = new AV.Query(className);
+
     if (think.isEmpty(where)) {
       return instance;
     }
@@ -36,6 +37,7 @@ module.exports = class extends Base {
       if (Array.isArray(where[k])) {
         if (where[k][0]) {
           const handler = where[k][0].toUpperCase();
+
           switch (handler) {
             case 'IN':
               instance.containedIn(k, where[k][1]);
@@ -46,6 +48,7 @@ module.exports = class extends Base {
             case 'LIKE': {
               const first = where[k][1][0];
               const last = where[k][1].slice(-1);
+
               if (first === '%' && last === '%') {
                 instance.contains(k, where[k][1].slice(1, -1));
               } else if (first === '%') {
@@ -65,6 +68,7 @@ module.exports = class extends Base {
         }
       }
     }
+
     return instance;
   }
 
@@ -74,6 +78,7 @@ module.exports = class extends Base {
     }
 
     const filters = [];
+
     for (const k in where._complex) {
       if (k === '_logic') {
         continue;
@@ -83,6 +88,7 @@ module.exports = class extends Base {
         ...where,
         [k]: where._complex[k],
       });
+
       filters.push(filter);
     }
 
@@ -91,6 +97,7 @@ module.exports = class extends Base {
 
   async _select(where, { desc, limit, offset, field } = {}) {
     const instance = this.where(this.tableName, where);
+
     if (desc) {
       instance.descending(desc);
     }
@@ -110,6 +117,7 @@ module.exports = class extends Base {
       }
       throw e;
     });
+
     return data.map((item) => item.toJSON());
   }
 
@@ -117,6 +125,7 @@ module.exports = class extends Base {
     let data = [];
     let ret = [];
     let offset = options.offset || 0;
+
     do {
       options.offset = offset + data.length;
       ret = await this._select(where, options);
@@ -137,9 +146,12 @@ module.exports = class extends Base {
 
     const cacheTableName = `cache_group_count_${key}`;
     const currentTableName = this.tableName;
+
     this.tableName = cacheTableName;
     const cacheData = await this.select({ _complex: where._complex });
+
     this.tableName = currentTableName;
+
     return cacheData;
   }
 
@@ -154,6 +166,7 @@ module.exports = class extends Base {
 
     const cacheTableName = `cache_group_count_${key}`;
     const currentTableName = this.tableName;
+
     this.tableName = cacheTableName;
 
     await think.promiseAllQueue(
@@ -161,6 +174,7 @@ module.exports = class extends Base {
         if (item.user_id && !think.isString(item.user_id)) {
           item.user_id = item.user_id.toString();
         }
+
         return this.add(item);
       }),
       1
@@ -190,11 +204,13 @@ module.exports = class extends Base {
         mail: data.mail,
       },
     });
+
     if (think.isEmpty(data)) {
       return;
     }
 
     let count = cacheData[0].count;
+
     switch (method) {
       case 'add':
         if (data.status === 'approved') {
@@ -214,6 +230,7 @@ module.exports = class extends Base {
     }
 
     const currentTableName = this.tableName;
+
     this.tableName = cacheTableName;
     await this.update({ count }, { objectId: cacheData[0].objectId }).catch(
       (e) => {
@@ -228,6 +245,7 @@ module.exports = class extends Base {
 
   async count(where = {}, options = {}) {
     const instance = this.where(this.tableName, where);
+
     if (!options.group) {
       return instance.count(options).catch((e) => {
         if (e.code === 101) {
@@ -243,22 +261,27 @@ module.exports = class extends Base {
       where
     );
     const cacheDataMap = {};
+
     for (let i = 0; i < cacheData.length; i++) {
       const key = options.group
         .map((item) => cacheData[i][item] || undefined)
         .join('_');
+
       cacheDataMap[key] = cacheData[i];
     }
 
     const counts = [];
     const countsPromise = [];
+
     for (let i = 0; i < options.group.length; i++) {
       const groupName = options.group[i];
+
       if (!where._complex || !Array.isArray(where._complex[groupName])) {
         continue;
       }
 
       const groupFlatValue = {};
+
       options.group.slice(0, i).forEach((group) => {
         groupFlatValue[group] = undefined;
       });
@@ -273,6 +296,7 @@ module.exports = class extends Base {
               }[item] || undefined)
           )
           .join('_');
+
         if (cacheDataMap[cacheKey]) {
           continue;
         }
@@ -293,6 +317,7 @@ module.exports = class extends Base {
             count: num,
           });
         });
+
         countsPromise.push(countPromise);
       }
     }
@@ -300,6 +325,7 @@ module.exports = class extends Base {
     await think.promiseAllQueue(countsPromise, 1);
     // cache data
     await this._setCmtGroupByMailUserIdCache(options.group.join('_'), counts);
+
     return [...cacheData, ...counts];
   }
 
@@ -309,15 +335,26 @@ module.exports = class extends Base {
   ) {
     const Table = AV.Object.extend(this.tableName);
     const instance = new Table();
-    instance.set(data);
+
+    const REVERSED_KEYS = ['objectId', 'createdAt', 'updatedAt'];
+
+    for (const k in data) {
+      if (REVERSED_KEYS.includes(k)) {
+        continue;
+      }
+      instance.set(k, data[k]);
+    }
 
     const acl = new AV.ACL();
+
     acl.setPublicReadAccess(read);
     acl.setPublicWriteAccess(write);
     instance.setACL(acl);
 
     const resp = await instance.save();
+
     await this._updateCmtGroupByMailUserIdCache(data, 'add');
+
     return resp.toJSON();
   }
 
@@ -328,17 +365,20 @@ module.exports = class extends Base {
     return Promise.all(
       ret.map(async (item) => {
         const _oldStatus = item.get('status');
+
         if (think.isFunction(data)) {
           item.set(data(item.toJSON()));
         } else {
           item.set(data);
         }
         const _newStatus = item.get('status');
+
         if (_newStatus && _oldStatus !== _newStatus) {
           await this._updateCmtGroupByMailUserIdCache(data, 'update_status');
         }
 
         const resp = await item.save();
+
         return resp.toJSON();
       })
     );
@@ -347,6 +387,7 @@ module.exports = class extends Base {
   async delete(where) {
     const instance = this.where(this.tableName, where);
     const data = await instance.find();
+
     await this._updateCmtGroupByMailUserIdCache(data, 'delete');
 
     return AV.Object.destroyAll(data);

package/src/service/storage/mongodb.js

@@ -9,6 +9,7 @@ module.exports = class extends Base {
 
     const filter = {};
     const parseKey = (k) => (k === 'objectId' ? '_id' : k);
+
     for (let k in where) {
       if (k === '_complex') {
         continue;
@@ -25,6 +26,7 @@ module.exports = class extends Base {
       if (Array.isArray(where[k])) {
         if (where[k][0]) {
           const handler = where[k][0].toUpperCase();
+
           switch (handler) {
             case 'IN':
               if (k === 'objectId') {
@@ -45,6 +47,7 @@ module.exports = class extends Base {
               const first = where[k][1][0];
               const last = where[k][1].slice(-1);
               let reg;
+
               if (first === '%' && last === '%') {
                 reg = new RegExp(where[k][1].slice(1, -1));
               } else if (first === '%') {
@@ -68,16 +71,19 @@ module.exports = class extends Base {
         }
       }
     }
+
     return filter;
   }
 
   where(instance, where) {
     const filter = this.parseWhere(where);
+
     if (!where._complex) {
       return instance.where(filter);
     }
 
     const filters = [];
+
     for (const k in where._complex) {
       if (k === '_logic') {
         continue;
@@ -96,6 +102,7 @@ module.exports = class extends Base {
 
   async select(where, { desc, limit, offset, field } = {}) {
     const instance = this.mongo(this.tableName);
+
     this.where(instance, where);
     if (desc) {
       instance.order(`${desc} DESC`);
@@ -108,6 +115,7 @@ module.exports = class extends Base {
     }
 
     const data = await instance.select();
+
     return data.map(({ _id, ...cmt }) => ({
       ...cmt,
       objectId: _id.toString(),
@@ -116,14 +124,17 @@ module.exports = class extends Base {
 
   async count(where = {}, { group } = {}) {
     const instance = this.mongo(this.tableName);
+
     this.where(instance, where);
     if (group) {
       instance.group(group);
     }
     const data = await instance.count({ raw: group });
+
     if (!Array.isArray(data)) {
       return data;
     }
+
     return data.map(({ _id, total: count }) => ({ ..._id, count }));
   }
 
@@ -135,11 +146,13 @@ module.exports = class extends Base {
 
     const instance = this.mongo(this.tableName);
     const id = await instance.add(data);
+
     return { ...data, objectId: id.toString() };
   }
 
   async update(data, where) {
     const instance = this.mongo(this.tableName);
+
     this.where(instance, where);
     const list = await instance.select();
 
@@ -147,8 +160,10 @@ module.exports = class extends Base {
       list.map(async (item) => {
         const updateData = typeof data === 'function' ? data(item) : data;
         const instance = this.mongo(this.tableName);
+
         this.where(instance, where);
         await instance.update(updateData);
+
         return { ...item, ...updateData };
       })
     );
@@ -156,7 +171,9 @@ module.exports = class extends Base {
 
   async delete(where) {
     const instance = this.mongo(this.tableName);
+
     this.where(instance, where);
+
     return instance.delete();
   }
 };

package/src/service/storage/mysql.js

@@ -3,6 +3,7 @@ const Base = require('./base');
 module.exports = class extends Base {
   parseWhere(filter) {
     const where = {};
+
     if (think.isEmpty(filter)) {
       return where;
     }
@@ -34,11 +35,13 @@ module.exports = class extends Base {
 
       where[k] = filter[k];
     }
+
     return where;
   }
 
   async select(where, { desc, limit, offset, field } = {}) {
     const instance = this.model(this.tableName);
+
     instance.where(this.parseWhere(where));
     if (desc) {
       instance.order(`${desc} DESC`);
@@ -52,11 +55,13 @@ module.exports = class extends Base {
     }
 
     const data = await instance.select();
+
     return data.map(({ id, ...cmt }) => ({ ...cmt, objectId: id }));
   }
 
   async count(where = {}, { group } = {}) {
     const instance = this.model(this.tableName);
+
     instance.where(this.parseWhere(where));
     if (!group) {
       return instance.count();
@@ -64,6 +69,7 @@ module.exports = class extends Base {
 
     instance.field([...group, 'COUNT(*) as count']);
     instance.group(group);
+
     return instance.select();
   }
 
@@ -75,6 +81,7 @@ module.exports = class extends Base {
 
     const instance = this.model(this.tableName);
     const id = await instance.add(data);
+
     return { ...data, objectId: id };
   }
 
@@ -82,12 +89,15 @@ module.exports = class extends Base {
     const list = await this.model(this.tableName)
       .where(this.parseWhere(where))
       .select();
+
     return Promise.all(
       list.map(async (item) => {
         const updateData = typeof data === 'function' ? data(item) : data;
+
         await this.model(this.tableName)
           .where({ id: item.id })
           .update(updateData);
+
         return { ...item, ...updateData };
       })
     );
@@ -95,6 +105,7 @@ module.exports = class extends Base {
 
   async delete(where) {
     const instance = this.model(this.tableName);
+
     return instance.where(this.parseWhere(where)).delete();
   }
 };

package/src/service/storage/postgresql.js

@@ -7,6 +7,7 @@ module.exports = class extends MySQL {
 
   async select(where, options = {}) {
     const lowerWhere = {};
+
     for (const i in where) {
       lowerWhere[i.toLowerCase()] = where[i];
     }
@@ -19,19 +20,22 @@ module.exports = class extends MySQL {
       options.field = options.field.map((field) => field.toLowerCase());
     }
 
-    const data = await super.select(where, options);
+    const data = await super.select(lowerWhere, options);
+
     return data.map(({ insertedat, createdat, updatedat, ...item }) => {
       const mapFields = {
         insertedAt: insertedat,
         createdAt: createdat,
         updatedAt: updatedat,
       };
+
       for (const field in mapFields) {
         if (!mapFields[field]) {
           continue;
         }
         item[field] = mapFields[field];
       }
+
       return item;
     });
   }
@@ -41,17 +45,20 @@ module.exports = class extends MySQL {
       .filter((key) => data[key])
       .forEach((key) => {
         const val = data[key];
+
         data[key.toLowerCase()] =
           val instanceof Date
             ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss')
             : val;
         delete data[key];
       });
+
     return super.add(data);
   }
 
   async count(...args) {
     let result = await super.count(...args);
+
     try {
       if (Array.isArray(result)) {
         result.forEach((r) => {
@@ -63,6 +70,7 @@ module.exports = class extends MySQL {
     } catch (e) {
       console.log(e);
     }
+
     return result;
   }
 };

package/vanilla.js

@@ -11,6 +11,7 @@ const instance = new Application({
 instance.run();
 
 let config = {};
+
 try {
   require('./config.js');
 } catch (e) {