@waline/vercel 1.36.4 → 1.37.0

package/src/service/storage/github.js

@@ -53,8 +53,7 @@ class Github {
   // content api can only get file < 1MB
   async get(filename) {
     const resp = await fetch(
-      'https://api.github.com/repos/' +
-        path.join(this.repo, 'contents', filename),
+      'https://api.github.com/repos/' + path.join(this.repo, 'contents', filename),
       {
         headers: {
           accept: 'application/vnd.github.v3+json',
@@ -64,11 +63,11 @@ class Github {
       },
     )
       .then((resp) => resp.json())
-      .catch((e) => {
-        const isTooLarge = e.message.includes('"too_large"');
+      .catch((err) => {
+        const isTooLarge = err.message.includes('"too_large"');
 
         if (!isTooLarge) {
-          throw e;
+          throw err;
         }
 
         return this.getLargeFile(filename);
@@ -83,9 +82,7 @@ class Github {
   // blob api can get file larger than 1MB
   async getLargeFile(filename) {
     const { tree } = await fetch(
-      'https://api.github.com/repos/' +
-        path.join(this.repo, 'git/trees/HEAD') +
-        '?recursive=1',
+      'https://api.github.com/repos/' + path.join(this.repo, 'git/trees/HEAD') + '?recursive=1',
       {
         headers: {
           accept: 'application/vnd.github.v3+json',
@@ -114,23 +111,19 @@ class Github {
   }
 
   async set(filename, content, { sha }) {
-    return fetch(
-      'https://api.github.com/repos/' +
-        path.join(this.repo, 'contents', filename),
-      {
-        method: 'PUT',
-        headers: {
-          accept: 'application/vnd.github.v3+json',
-          authorization: 'token ' + this.token,
-          'user-agent': 'Waline',
-        },
-        body: JSON.stringify({
-          sha,
-          message: 'feat(waline): update comment data',
-          content: Buffer.from(content, 'utf-8').toString('base64'),
-        }),
+    return fetch('https://api.github.com/repos/' + path.join(this.repo, 'contents', filename), {
+      method: 'PUT',
+      headers: {
+        accept: 'application/vnd.github.v3+json',
+        authorization: 'token ' + this.token,
+        'user-agent': 'Waline',
       },
-    );
+      body: JSON.stringify({
+        sha,
+        message: 'feat(waline): update comment data',
+        content: Buffer.from(content, 'utf-8').toString('base64'),
+      }),
+    });
   }
 }
 
@@ -147,11 +140,11 @@ module.exports = class extends Base {
 
   async collection(tableName) {
     const filename = path.join(this.basePath, tableName + '.csv');
-    const file = await this.git.get(filename).catch((e) => {
-      if (e.statusCode === 404) {
+    const file = await this.git.get(filename).catch((err) => {
+      if (err.statusCode === 404) {
         return '';
       }
-      throw e;
+      throw err;
     });
 
     return new Promise((resolve, reject) => {
@@ -164,7 +157,9 @@ module.exports = class extends Base {
       })
         .on('error', reject)
         .on('data', (row) => data.push(row))
-        .on('end', () => resolve(data));
+        .on('end', () => {
+          resolve(data);
+        });
     });
   }
 
@@ -187,7 +182,7 @@ module.exports = class extends Base {
 
     const filters = [];
 
-    for (let k in where) {
+    for (const k in where) {
       if (k === '_complex') {
         continue;
       }
@@ -210,12 +205,14 @@ module.exports = class extends Base {
       const handler = where[k][0].toUpperCase();
 
       switch (handler) {
-        case 'IN':
+        case 'IN': {
           filters.push((item) => where[k][1].includes(item[k]));
           break;
-        case 'NOT IN':
+        }
+        case 'NOT IN': {
           filters.push((item) => !where[k][1].includes(item[k]));
           break;
+        }
         case 'LIKE': {
           const first = where[k][1][0];
           const last = where[k][1].slice(-1);
@@ -231,12 +228,14 @@ module.exports = class extends Base {
           filters.push((item) => reg.test(item[k]));
           break;
         }
-        case '!=':
+        case '!=': {
           filters.push((item) => item[k] !== where[k][1]);
           break;
-        case '>':
+        }
+        case '>': {
           filters.push((item) => item[k] >= where[k][1]);
           break;
+        }
       }
     }
 
@@ -266,9 +265,7 @@ module.exports = class extends Base {
 
     const logicFn = logicMap[where._complex._logic];
 
-    return data.filter((item) =>
-      logicFn.call(filters, (filter) => filter.every((fn) => fn(item))),
-    );
+    return data.filter((item) => logicFn.call(filters, (filter) => filter.every((fn) => fn(item))));
   }
 
   async select(where, { desc, limit, offset, field } = {}) {
@@ -288,7 +285,7 @@ module.exports = class extends Base {
       });
     }
 
-    data = data.slice(limit || 0, offset || data.length);
+    data = data.slice(limit ?? 0, offset ?? data.length);
     if (field) {
       field.push('id');
       const fieldObj = {};
@@ -321,9 +318,9 @@ module.exports = class extends Base {
     const counts = {};
 
     // FIXME: The loop is weird @lizheming
-    // eslint-disable-next-line @typescript-eslint/prefer-for-of
+    // oxlint-disable-next-line typescript/prefer-for-of
     for (let i = 0; i < data.length; i++) {
-      const key = group.map((field) => data[field]).join();
+      const key = group.map((field) => data[field]).join(',');
 
       if (!counts[key]) {
         counts[key] = { count: 0 };
@@ -342,7 +339,7 @@ module.exports = class extends Base {
     // { access: { read = true, write = true } = { read: true, write: true } } = {}
   ) {
     const instance = await this.collection(this.tableName);
-    const id = Math.random().toString(36).substr(2, 15);
+    const id = Math.random().toString(36).slice(2, 15);
 
     instance.push({ ...data, id });
     await this.save(this.tableName, instance, instance.sha);
@@ -373,8 +370,8 @@ module.exports = class extends Base {
   async delete(where) {
     const instance = await this.collection(this.tableName);
     const deleteData = this.where(instance, where);
-    const deleteId = deleteData.map(({ id }) => id);
-    const data = instance.filter((data) => !deleteId.includes(data.id));
+    const deleteId = new Set(deleteData.map(({ id }) => id));
+    const data = instance.filter((data) => !deleteId.has(data.id));
 
     await this.save(this.tableName, data, instance.sha);
   }

package/src/service/storage/leancloud.js

@@ -41,12 +41,14 @@ module.exports = class extends Base {
           const handler = where[k][0].toUpperCase();
 
           switch (handler) {
-            case 'IN':
+            case 'IN': {
               instance.containedIn(k, where[k][1]);
               break;
-            case 'NOT IN':
+            }
+            case 'NOT IN': {
               instance.notContainedIn(k, where[k][1]);
               break;
+            }
             case 'LIKE': {
               const first = where[k][1][0];
               const last = where[k][1].slice(-1);
@@ -60,12 +62,14 @@ module.exports = class extends Base {
               }
               break;
             }
-            case '!=':
+            case '!=': {
               instance.notEqualTo(k, where[k][1]);
               break;
-            case '>':
+            }
+            case '>': {
               instance.greaterThan(k, where[k][1]);
               break;
+            }
           }
         }
       }
@@ -113,11 +117,11 @@ module.exports = class extends Base {
       instance.select(field);
     }
 
-    const data = await instance.find().catch((e) => {
-      if (e.code === 101) {
+    const data = await instance.find().catch((err) => {
+      if (err.code === 101) {
         return [];
       }
-      throw e;
+      throw err;
     });
 
     return data.map((item) => item.toJSON());
@@ -126,7 +130,7 @@ module.exports = class extends Base {
   async select(where, options = {}) {
     let data = [];
     let ret = [];
-    let offset = options.offset || 0;
+    const offset = options.offset ?? 0;
 
     do {
       options.offset = offset + data.length;
@@ -185,10 +189,7 @@ module.exports = class extends Base {
   }
 
   async _updateCmtGroupByMailUserIdCache(data, method) {
-    if (
-      this.tableName !== 'Comment' ||
-      !think.isArray(think.config('levels'))
-    ) {
+    if (this.tableName !== 'Comment' || !think.isArray(think.config('levels'))) {
       return;
     }
 
@@ -200,9 +201,7 @@ module.exports = class extends Base {
     const cacheData = await this.select({
       _complex: {
         _logic: 'or',
-        user_id: think.isObject(data.user_id)
-          ? data.user_id.toString()
-          : data.user_id,
+        user_id: think.isObject(data.user_id) ? data.user_id.toString() : data.user_id,
         mail: data.mail,
       },
     });
@@ -211,37 +210,38 @@ module.exports = class extends Base {
       return;
     }
 
-    let count = cacheData[0].count;
+    let { count } = cacheData[0];
 
     switch (method) {
-      case 'add':
+      case 'add': {
         if (data.status === 'approved') {
           count += 1;
         }
         break;
-      case 'udpate_status':
+      }
+      case 'udpate_status': {
         if (data.status === 'approved') {
           count += 1;
         } else {
           count -= 1;
         }
         break;
-      case 'delete':
+      }
+      case 'delete': {
         count -= 1;
         break;
+      }
     }
 
     const currentTableName = this.tableName;
 
     this.tableName = cacheTableName;
-    await this.update({ count }, { objectId: cacheData[0].objectId }).catch(
-      (e) => {
-        if (e.code === 101) {
-          return;
-        }
-        throw e;
-      },
-    );
+    await this.update({ count }, { objectId: cacheData[0].objectId }).catch((err) => {
+      if (err.code === 101) {
+        return;
+      }
+      throw err;
+    });
     this.tableName = currentTableName;
   }
 
@@ -249,22 +249,19 @@ module.exports = class extends Base {
     const instance = this.where(this.tableName, where);
 
     if (!options.group) {
-      return instance.count(options).catch((e) => {
-        if (e.code === 101) {
+      return instance.count(options).catch((err) => {
+        if (err.code === 101) {
           return 0;
         }
-        throw e;
+        throw err;
       });
     }
 
     // get group count cache by group field where data
-    const cacheData = await this._getCmtGroupByMailUserIdCache(
-      options.group.join('_'),
-      where,
-    );
+    const cacheData = await this._getCmtGroupByMailUserIdCache(options.group.join('_'), where);
 
     if (!where._complex) {
-      if (cacheData.length) {
+      if (cacheData.length > 0) {
         return cacheData;
       }
 
@@ -272,9 +269,7 @@ module.exports = class extends Base {
       const countsMap = {};
 
       for (const count of counts) {
-        const key = options.group
-          .map((item) => count[item] || undefined)
-          .join('_');
+        const key = options.group.map((item) => count[item] ?? undefined).join('_');
 
         if (!countsMap[key]) {
           countsMap[key] = {};
@@ -298,9 +293,7 @@ module.exports = class extends Base {
     const cacheDataMap = {};
 
     for (const item of cacheData) {
-      const key = options.group
-        .map((item) => item[item] || undefined)
-        .join('_');
+      const key = options.group.map((item) => item[item] ?? undefined).join('_');
 
       cacheDataMap[key] = item;
     }
@@ -328,7 +321,7 @@ module.exports = class extends Base {
               ({
                 ...groupFlatValue,
                 [groupName]: item,
-              })[item] || undefined,
+              })[item] ?? undefined,
           )
           .join('_');
 
@@ -364,19 +357,14 @@ module.exports = class extends Base {
     return [...cacheData, ...counts];
   }
 
-  async add(
-    data,
-    {
-      access: { read = true, write = true } = { read: true, write: true },
-    } = {},
-  ) {
+  async add(data, { access: { read = true, write = true } = { read: true, write: true } } = {}) {
     const Table = AV.Object.extend(this.tableName);
     const instance = new Table();
 
-    const REVERSED_KEYS = ['objectId', 'createdAt', 'updatedAt'];
+    const REVERSED_KEYS = new Set(['objectId', 'createdAt', 'updatedAt']);
 
     for (const k in data) {
-      if (REVERSED_KEYS.includes(k)) {
+      if (REVERSED_KEYS.has(k)) {
         continue;
       }
       instance.set(k, data[k]);
@@ -403,13 +391,12 @@ module.exports = class extends Base {
       ret.map(async (item) => {
         const _oldStatus = item.get('status');
 
-        const updateData =
-          typeof data === 'function' ? data(item.toJSON()) : data;
+        const updateData = typeof data === 'function' ? data(item.toJSON()) : data;
 
-        const REVERSED_KEYS = ['createdAt', 'updatedAt'];
+        const REVERSED_KEYS = new Set(['createdAt', 'updatedAt']);
 
         for (const k in updateData) {
-          if (REVERSED_KEYS.includes(k)) {
+          if (REVERSED_KEYS.has(k)) {
             continue;
           }
           item.set(k, updateData[k]);

package/src/service/storage/mongodb.js

@@ -11,7 +11,7 @@ module.exports = class extends Base {
     const filter = {};
     const parseKey = (k) => (k === 'objectId' ? '_id' : k);
 
-    for (let k in where) {
+    for (const k in where) {
       if (k === '_complex') {
         continue;
       }
@@ -29,7 +29,7 @@ module.exports = class extends Base {
           const handler = where[k][0].toUpperCase();
 
           switch (handler) {
-            case 'IN':
+            case 'IN': {
               if (k === 'objectId') {
                 filter[parseKey(k)] = { $in: where[k][1].map(ObjectId) };
               } else {
@@ -38,12 +38,13 @@ module.exports = class extends Base {
                 };
               }
               break;
-            case 'NOT IN':
+            }
+            case 'NOT IN': {
               filter[parseKey(k)] = {
-                $nin:
-                  k === 'objectId' ? where[k][1].map(ObjectId) : where[k][1],
+                $nin: k === 'objectId' ? where[k][1].map(ObjectId) : where[k][1],
               };
               break;
+            }
             case 'LIKE': {
               const first = where[k][1][0];
               const last = where[k][1].slice(-1);
@@ -62,12 +63,14 @@ module.exports = class extends Base {
               }
               break;
             }
-            case '!=':
+            case '!=': {
               filter[parseKey(k)] = { $ne: where[k][1] };
               break;
-            case '>':
+            }
+            case '>': {
               filter[parseKey(k)] = { $gt: where[k][1] };
               break;
+            }
           }
         }
       }
@@ -109,7 +112,7 @@ module.exports = class extends Base {
       instance.order(`${desc} DESC`);
     }
     if (limit || offset) {
-      instance.limit(offset || 0, limit);
+      instance.limit(offset ?? 0, limit);
     }
     if (field) {
       instance.field(field);

package/src/service/storage/mysql.js

@@ -25,7 +25,7 @@ module.exports = class extends Base {
       }
 
       if (Array.isArray(filter[k])) {
-        if (filter[k][0] === 'IN' && !filter[k][1].length) {
+        if (filter[k][0] === 'IN' && filter[k][1].length === 0) {
           continue;
         }
         if (think.isDate(filter[k][1])) {
@@ -47,7 +47,7 @@ module.exports = class extends Base {
       instance.order({ [desc]: 'DESC' });
     }
     if (limit || offset) {
-      instance.limit(offset || 0, limit);
+      instance.limit(offset ?? 0, limit);
     }
     if (field) {
       field.push('id');
@@ -80,8 +80,8 @@ module.exports = class extends Base {
     }
     const date = new Date();
 
-    if (!data.createdAt) data.createdAt = date;
-    if (!data.updatedAt) data.updatedAt = date;
+    data.createdAt ??= date;
+    data.updatedAt ??= date;
 
     const instance = this.model(this.tableName);
     const id = await instance.add(data);
@@ -90,17 +90,13 @@ module.exports = class extends Base {
   }
 
   async update(data, where) {
-    const list = await this.model(this.tableName)
-      .where(this.parseWhere(where))
-      .select();
+    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);
+        await this.model(this.tableName).where({ id: item.id }).update(updateData);
 
         return { ...item, ...updateData };
       }),
@@ -116,8 +112,6 @@ module.exports = class extends Base {
   async setSeqId(id) {
     const instance = this.model(this.tableName);
 
-    return instance.query(
-      `ALTER TABLE ${instance.tableName} AUTO_INCREMENT = ${id};`,
-    );
+    return instance.query(`ALTER TABLE ${instance.tableName} AUTO_INCREMENT = ${id};`);
   }
 };

package/src/service/storage/postgresql.js

@@ -48,10 +48,8 @@ module.exports = class extends MySQL {
         const val = data[key];
 
         data[key.toLowerCase()] =
-          val instanceof Date
-            ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss')
-            : val;
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+          val instanceof Date ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss') : val;
+        // oxlint-disable-next-line typescript/no-dynamic-delete
         delete data[key];
       });
 
@@ -64,13 +62,13 @@ module.exports = class extends MySQL {
     try {
       if (Array.isArray(result)) {
         result.forEach((r) => {
-          r.count = parseInt(r.count);
+          r.count = Number.parseInt(r.count);
         });
       } else {
-        result = parseInt(result);
+        result = Number.parseInt(result);
       }
-    } catch (e) {
-      console.log(e);
+    } catch (err) {
+      console.log(err);
     }
 
     return result;
@@ -79,8 +77,6 @@ module.exports = class extends MySQL {
   async setSeqId(id) {
     const instance = this.model(this.tableName);
 
-    return instance.query(
-      `ALTER SEQUENCE ${instance.tableName}_seq RESTART WITH ${id};`,
-    );
+    return instance.query(`ALTER SEQUENCE ${instance.tableName}_seq RESTART WITH ${id};`);
   }
 };