Просмотр исходного кода

fix non-autofixable biome errors

Futa Arai 4 месяцев назад
Родитель
Сommit
747c7e7163

+ 12 - 7
apps/app/src/server/routes/apiv3/g2g-transfer.ts

@@ -7,6 +7,7 @@ import { createReadStream } from 'fs';
 import multer from 'multer';
 import path from 'path';
 
+import type { GrowiArchiveImportOption } from '~/models/admin/growi-archive-import-option';
 import { accessTokenParser } from '~/server/middlewares/access-token-parser';
 import { isG2GTransferError } from '~/server/models/vo/g2g-transfer-error';
 import { configManager } from '~/server/service/config-manager';
@@ -299,9 +300,9 @@ module.exports = (crowi: Crowi): Router => {
       /*
        * parse multipart form data
        */
-      let collections;
-      let optionsMap;
-      let sourceGROWIUploadConfigs;
+      let collections: string[];
+      let optionsMap: { [key: string]: GrowiArchiveImportOption };
+      let sourceGROWIUploadConfigs: any;
       try {
         collections = JSON.parse(strCollections);
         optionsMap = JSON.parse(strOptionsMap);
@@ -317,14 +318,18 @@ module.exports = (crowi: Crowi): Router => {
       /*
        * unzip and parse
        */
-      let meta;
-      let innerFileStats;
+      let meta: object | undefined;
+      let innerFileStats: {
+        fileName: string;
+        collectionName: string;
+        size: number;
+      }[];
       try {
         const zipFile = importService.getFile(file.filename);
         await importService.unzip(zipFile);
 
         const zipFileStat = await growiBridgeService.parseZipFile(zipFile);
-        innerFileStats = zipFileStat?.innerFileStats;
+        innerFileStats = zipFileStat?.innerFileStats ?? [];
         meta = zipFileStat?.meta;
       } catch (err) {
         logger.error(err);
@@ -440,7 +445,7 @@ module.exports = (crowi: Crowi): Router => {
       const { file } = req;
       const { attachmentMetadata } = req.body;
 
-      let attachmentMap;
+      let attachmentMap: { fileName: any; fileSize: any };
       try {
         attachmentMap = JSON.parse(attachmentMetadata);
       } catch (err) {

+ 11 - 5
apps/app/src/server/routes/apiv3/import.ts

@@ -1,5 +1,6 @@
 import { SCOPE } from '@growi/core/dist/interfaces';
 import { ErrorV3 } from '@growi/core/dist/models';
+import type { Router } from 'express';
 
 import { SupportedAction } from '~/interfaces/activity';
 import type { GrowiArchiveImportOption } from '~/models/admin/growi-archive-import-option';
@@ -8,6 +9,7 @@ import { accessTokenParser } from '~/server/middlewares/access-token-parser';
 import type { ImportSettings } from '~/server/service/import';
 import { getImportService } from '~/server/service/import';
 import { generateOverwriteParams } from '~/server/service/import/overwrite-params';
+import type { ZipFileStat } from '~/server/service/interfaces/export';
 import loggerFactory from '~/utils/logger';
 
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
@@ -124,7 +126,7 @@ const router = express.Router();
  *                  type: integer
  *                  nullable: true
  */
-export default function route(crowi: Crowi): void {
+export default function route(crowi: Crowi): Router {
   const { growiBridgeService, socketIoService } = crowi;
   const importService = getImportService();
 
@@ -347,8 +349,12 @@ export default function route(crowi: Crowi): void {
       /*
        * unzip, parse
        */
-      let meta;
-      let fileStatsToImport;
+      let meta: object;
+      let fileStatsToImport: {
+        fileName: string;
+        collectionName: string;
+        size: number;
+      }[];
       try {
         // unzip
         await importService.unzip(zipFile);
@@ -462,7 +468,7 @@ export default function route(crowi: Crowi): void {
     async (req, res) => {
       const { file } = req;
       const zipFile = importService.getFile(file.filename);
-      let data;
+      let data: ZipFileStat | null;
 
       try {
         data = await growiBridgeService.parseZipFile(zipFile);
@@ -473,7 +479,7 @@ export default function route(crowi: Crowi): void {
       }
       try {
         // validate with meta.json
-        importService.validate(data.meta);
+        importService.validate(data?.meta);
 
         const parameters = {
           action: SupportedAction.ACTION_ADMIN_ARCHIVE_DATA_UPLOAD,

+ 2 - 1
apps/app/src/server/routes/apiv3/installer.ts

@@ -1,3 +1,4 @@
+import type { IUser } from '@growi/core';
 import { ErrorV3 } from '@growi/core/dist/models';
 import type { Request, Router } from 'express';
 import express from 'express';
@@ -102,7 +103,7 @@ module.exports = (crowi: Crowi): Router => {
 
       const installerService = new InstallerService(crowi);
 
-      let adminUser;
+      let adminUser: IUser;
       try {
         adminUser = await installerService.install(
           {

+ 3 - 3
apps/app/src/server/routes/apiv3/page-listing.ts

@@ -262,7 +262,7 @@ const routerFactory = (crowi: Crowi): Router => {
 
         const foundIds = pages.map((page) => page._id);
 
-        let shortBodiesMap;
+        let shortBodiesMap: Record<string, string | null> | undefined;
         if (attachShortBody) {
           shortBodiesMap = await pageService.shortBodiesMapByPageIds(
             foundIds,
@@ -270,7 +270,7 @@ const routerFactory = (crowi: Crowi): Router => {
           );
         }
 
-        let bookmarkCountMap;
+        let bookmarkCountMap: Record<string, number> | undefined;
         if (attachBookmarkCount) {
           bookmarkCountMap = (await Bookmark.getPageIdToCountMap(
             foundIds,
@@ -311,7 +311,7 @@ const routerFactory = (crowi: Crowi): Router => {
                 isAbleToDeleteCompletely: canDeleteCompletely,
                 revisionShortBody:
                   shortBodiesMap != null
-                    ? shortBodiesMap[page._id.toString()]
+                    ? (shortBodiesMap[page._id.toString()] ?? undefined)
                     : undefined,
               } satisfies IPageInfoForListing);