chore: Update major dependencies

ideafast · Sep 11, 2024 · a254e01 · a254e01
1 parent acd57e4
commit a254e01
Show file tree

Hide file tree

Showing 43 changed files with 296 additions and 274 deletions.
diff --git a/.commitlintrc.js → .commitlintrc.cjs b/.commitlintrc.js → .commitlintrc.cjs
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -30,7 +30,14 @@ const javascriptRules = {
     'comma-dangle': ['error', 'never'],
     'no-trailing-spaces': 'error',
     'no-extra-semi': 'error',
-    'no-unused-vars': ['error', { args: 'after-used', varsIgnorePattern: '^__unused' }],
+    'no-unused-vars': ['error', {
+        args: 'after-used',
+        argsIgnorePattern: '^__unused',
+        caughtErrorsIgnorePattern: '^__unused',
+        destructuredArrayIgnorePattern: '^__unused',
+        varsIgnorePattern: '^__unused',
+        ignoreRestSiblings: true
+    }],
     'semi': ['error', 'always']
 };
 
@@ -41,7 +48,14 @@ const typescriptRules = {
     '@typescript-eslint/no-non-null-assertion': 'error',
     '@typescript-eslint/no-unused-vars': [
         'error',
-        { args: 'after-used', varsIgnorePattern: '^__unused' }
+        {
+            args: 'after-used',
+            argsIgnorePattern: '^__unused',
+            caughtErrorsIgnorePattern: '^__unused',
+            destructuredArrayIgnorePattern: '^__unused',
+            varsIgnorePattern: '^__unused',
+            ignoreRestSiblings: true
+        }
     ],
     '@typescript-eslint/no-floating-promises': 'error',
     '@typescript-eslint/promise-function-async': 'error',
@@ -54,7 +68,8 @@ module.exports = {
     parserOptions: {
         ecmaVersion: 2022,
         tsconfigRootDir: __dirname,
-        EXPERIMENTAL_useProjectService: true,
+        projectService: true,
+        allowDefaultProject: true,
         warnOnUnsupportedTypeScriptVersion: false,
         project: [
             './tsconfig.eslint.json',

diff --git a/jest.preset.js → jest.preset.cjs b/jest.preset.js → jest.preset.cjs
diff --git a/nx.json b/nx.json
@@ -37,7 +37,7 @@
             "inputs": [
                 "default",
                 "^default",
-                "{workspaceRoot}/jest.preset.js"
+                "{workspaceRoot}/jest.preset.cjs"
             ],
             "cache": true,
             "options": {

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
         "@svgr/webpack": "8.1.0",
         "@swc/cli": "0.4.0",
-        "@swc/core": "1.7.25",
+        "@swc/core": "1.7.26",
         "@swc/jest": "0.2.36",
         "@testing-library/react": "16.0.1",
         "@types/bcrypt": "5.0.2",
@@ -56,7 +56,7 @@
         "@types/jest": "29.5.12",
         "@types/json2csv": "5.0.7",
         "@types/jsonwebtoken": "9.0.6",
-        "@types/node": "^20.16.5",
+        "@types/node": "^22.5.4",
         "@types/nodemailer": "6.4.15",
         "@types/passport": "1.0.16",
         "@types/qrcode": "1.5.5",
@@ -67,8 +67,8 @@
         "@types/tmp": "0.2.6",
         "@types/uuid": "10.0.0",
         "@types/webpack-env": "1.18.5",
-        "@typescript-eslint/eslint-plugin": "7.18.0",
-        "@typescript-eslint/parser": "7.18.0",
+        "@typescript-eslint/eslint-plugin": "8.5.0",
+        "@typescript-eslint/parser": "8.5.0",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.30.0",
@@ -81,19 +81,19 @@
         "husky": "^9.1.5",
         "jest": "29.7.0",
         "jest-environment-jsdom": "29.7.0",
-        "mongodb-memory-server": "9.4.1",
+        "mongodb-memory-server": "10.0.0",
         "nx": "19.7.2",
         "prettier": "^3.3.3",
         "react-refresh": "^0.14.2",
-        "supertest": "6.3.4",
+        "supertest": "7.0.0",
         "swc-loader": "0.2.6",
         "ts-essentials": "10.0.2",
         "ts-jest": "29.2.5",
         "ts-node": "10.9.2",
         "typescript": "5.6.2",
         "url-loader": "^4.1.1",
         "webpack": "^5.94.0",
-        "webpack-merge": "^5.10.0"
+        "webpack-merge": "^6.0.1"
     },
     "dependencies": {
         "@ant-design/icons": "5.4.0",
@@ -138,7 +138,7 @@
         "jstat": "1.9.6",
         "lint-staged": "15.2.10",
         "lodash-es": "4.17.21",
-        "minio": "7.1.3",
+        "minio": "8.0.1",
         "mongodb": "6.8.1",
         "multer": "1.4.4",
         "nodemailer": "6.9.15",

diff --git a/packages/itmat-apis/express-user.d.ts b/packages/itmat-apis/express-user.d.ts
@@ -4,7 +4,7 @@ declare global {
 
     namespace Express {
 
-        // eslint-disable-next-line @typescript-eslint/no-empty-interface
+        // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-empty-object-type
         interface User extends IUserWithoutToken { }
 
         interface Request {

diff --git a/packages/itmat-apis/jest.config.ts b/packages/itmat-apis/jest.config.ts
@@ -8,7 +8,7 @@ const { exclude: _, ...swcJestConfig } = JSON.parse(
 );
 export default {
     displayName: 'itmat-apis',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
     },

diff --git a/packages/itmat-apis/src/graphql/resolvers/studyResolvers.ts b/packages/itmat-apis/src/graphql/resolvers/studyResolvers.ts
@@ -122,7 +122,7 @@ export class StudyResolvers {
                     uploadedBy: el.life.createdUser
                 };
             });
-        } catch (e) {
+        } catch (__unused__exception) {
             return [];
         }
     }

diff --git a/packages/itmat-commons/jest.config.ts b/packages/itmat-commons/jest.config.ts
@@ -8,7 +8,7 @@ const { exclude: _, ...swcJestConfig } = JSON.parse(
 );
 export default {
     displayName: 'itmat-commons',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
     },

diff --git a/packages/itmat-commons/src/utils/database.ts b/packages/itmat-commons/src/utils/database.ts
@@ -49,18 +49,18 @@ export class Database<configType extends IDatabaseBaseConfig, C = Record<keyof c
     ): Promise<MongoClient> {
         this.config = config;
         const shouldOutput = process.env['JEST_WORKER_ID'] !== undefined;
-        shouldOutput && Logger.log('Connecting to the database..');
+        if (shouldOutput) Logger.log('Connecting to the database..');
         /* any error throw here will be caught by the server */
         this.localClient = await (new mongoClient(config.mongo_url)).connect();
-        shouldOutput && Logger.log('Connected to database.');
+        if (shouldOutput) Logger.log('Connected to database.');
 
-        shouldOutput && Logger.log('Performing basic checks..');
+        if (shouldOutput) Logger.log('Performing basic checks..');
         await this.checkAllCollectionsArePresent();
-        shouldOutput && Logger.log('Done basic checks.');
+        if (shouldOutput) Logger.log('Done basic checks.');
 
         this.assignCollections();
 
-        shouldOutput && Logger.log('Finished with database initialisation.');
+        if (shouldOutput) Logger.log('Finished with database initialisation.');
         return this.localClient;
     }
 

diff --git a/packages/itmat-commons/src/utils/objStore.ts b/packages/itmat-commons/src/utils/objStore.ts
@@ -17,9 +17,10 @@ export class ObjectStore {
 
     public async isConnected(): Promise<boolean> {
         try {
-            this.client && await this.client.listBuckets();
+            if (this.client)
+                await this.client.listBuckets();
             return true;
-        } catch (e) {
+        } catch (__unused__exception) {
             return false;
         }
     }
@@ -59,7 +60,7 @@ export class ObjectStore {
         try {
             await this.client.statObject(lowercasestudyid, uri);
             fileExists = true;
-        } catch (e) {
+        } catch (__unused__exception) {
             fileExists = false;
         }
 
@@ -87,7 +88,10 @@ export class ObjectStore {
         // Copy the object
         const conds = new Minio.CopyConditions();
         const result = await this.client.copyObject(lowerTargetBucket, targetUri, `/${lowerSourceBucket}/${sourceUri}`, conds);
-        return result.etag;
+        if (Object.hasOwn(result, 'Etag'))
+            return (result as Record<string, unknown>)?.['Etag'];
+        else
+            return (result as Record<string, unknown>)?.['etag'];
     }
 
     public async downloadFile(studyId: string, uri: string): Promise<Readable> {

diff --git a/packages/itmat-cores/express-user.d.ts b/packages/itmat-cores/express-user.d.ts
@@ -4,7 +4,7 @@ declare global {
 
     namespace Express {
 
-        // eslint-disable-next-line @typescript-eslint/no-empty-interface
+        // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-empty-object-type
         interface User extends IUserWithoutToken { }
 
         interface Request {

diff --git a/packages/itmat-cores/jest.config.ts b/packages/itmat-cores/jest.config.ts
@@ -8,7 +8,7 @@ const { exclude: _, ...swcJestConfig } = JSON.parse(
 );
 export default {
     displayName: 'itmat-cores',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
     },

diff --git a/packages/itmat-cores/src/coreFunc/dataCore.ts b/packages/itmat-cores/src/coreFunc/dataCore.ts
@@ -720,7 +720,8 @@ export class DataCore {
                 bulk = this.db.collections.data_collection.initializeUnorderedBulkOp();
             }
         }
-        bulk.batches.length !== 0 && await bulk.execute();
+        if (bulk.batches.length !== 0)
+            await bulk.execute();
         return response;
     }
 

diff --git a/packages/itmat-cores/src/coreFunc/studyCore.ts b/packages/itmat-cores/src/coreFunc/studyCore.ts
@@ -211,7 +211,7 @@ export class StudyCore {
                 }
                 fileEntry = await this.fileCore.uploadFile(requester, studyId, null, profile, enumFileTypes[(profile.filename.split('.').pop() || '').toUpperCase() as keyof typeof enumFileTypes], enumFileCategories.PROFILE_FILE);
                 setObj['profile'] = fileEntry.id;
-            } catch (error) {
+            } catch (__unused__exception) {
                 setObj['profile'] = study.profile;
             }
         }

diff --git a/packages/itmat-cores/src/coreFunc/userCore.ts b/packages/itmat-cores/src/coreFunc/userCore.ts
@@ -104,7 +104,7 @@ export class UserCore {
         let email;
         try {
             email = await decryptEmail(this.config.aesSecret, encryptedEmail, salt, iv);
-        } catch (e) {
+        } catch (__unused__exception) {
             throw new CoreError(
                 enumCoreErrors.CLIENT_MALFORMED_INPUT,
                 'Token is not valid.'
@@ -642,7 +642,7 @@ export class UserCore {
             try {
                 const reGenPubkey = pubkeycrypto.reGenPkfromSk(privateKey);
                 messageToBeSigned = pubkeycrypto.hashdigest(reGenPubkey);
-            } catch (error) {
+            } catch (__unused__exception) {
                 throw new CoreError(
                     enumCoreErrors.CLIENT_MALFORMED_INPUT,
                     'Error: private-key incorrect!'
@@ -707,7 +707,7 @@ export class UserCore {
                     'Signature vs Public-key mismatched.'
                 );
             }
-        } catch (error) {
+        } catch (__unused__exception) {
             throw new CoreError(
                 enumCoreErrors.CLIENT_MALFORMED_INPUT,
                 'Error: Signature or Public-key is incorrect.'
@@ -1194,7 +1194,7 @@ export class UserCore {
         let email;
         try {
             email = await decryptEmail(this.config.aesSecret, encryptedEmail, salt, iv);
-        } catch (e) {
+        } catch (__unused__exception) {
             throw new CoreError(
                 enumCoreErrors.CLIENT_MALFORMED_INPUT,
                 'Token is invalid.'

diff --git a/packages/itmat-cores/src/utils/configManager.ts b/packages/itmat-cores/src/utils/configManager.ts
@@ -34,7 +34,7 @@ export class ConfigurationManager {
                     config = merge(config, JSON.parse(content));
                     Logger.log(`Applied configuration from ${path.resolve(configurationFile)}.`);
                 }
-            } catch (e) {
+            } catch (__unused__exception) {
                 Logger.error(chalk.red('Cannot parse configuration file.'));
             }
         });

diff --git a/packages/itmat-cores/src/webdav/dmpWebDAV.ts b/packages/itmat-cores/src/webdav/dmpWebDAV.ts
@@ -449,13 +449,14 @@ export class DMPWebDAVAuthentication implements HTTPAuthentication {
         this.realm = realm ?? 'realm';
         this.db = db;
     }
+
     askForAuthentication(): { 'WWW-Authenticate': string; } {
         return {
             'WWW-Authenticate': 'Basic realm="' + this.realm + '"'
         };
     }
 
-    async getUser(ctx: webdav.HTTPRequestContext, callback: (error: Error | null, user?: IUserWithoutToken) => void): Promise<void> {
+    getUser(ctx: webdav.HTTPRequestContext, callback: (error: Error | null, user?: IUserWithoutToken) => void): void {
         try {
             const token = ctx.headers.find('authorization') ?? '';
             const decodedPayload = jwt.decode(token);
@@ -473,8 +474,11 @@ export class DMPWebDAVAuthentication implements HTTPAuthentication {
                 }
             });
             try {
-                const associatedUser = await userRetrieval(this.db, pubkey);
-                callback(null, associatedUser);
+                userRetrieval(this.db, pubkey).then((associatedUser) => {
+                    callback(null, associatedUser);
+                }).catch(() => {
+                    callback(new Error('Invalid credentials'));
+                });
             } catch {
                 callback(new Error('Invalid credentials'));
             }

diff --git a/packages/itmat-docker/package.json b/packages/itmat-docker/package.json
@@ -20,7 +20,7 @@
         "express": "4.20.0",
         "express-rate-limit": "7.4.0",
         "isobject": "4.0.0",
-        "minio": "7.1.3",
+        "minio": "8.0.1",
         "mongodb": "6.8.1",
         "sanitize-filename": "1.6.3"
     }

diff --git a/packages/itmat-interface/express-user.d.ts b/packages/itmat-interface/express-user.d.ts
@@ -4,7 +4,7 @@ declare global {
 
     namespace Express {
 
-        // eslint-disable-next-line @typescript-eslint/no-empty-interface
+        // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-empty-object-type
         interface User extends IUserWithoutToken { }
 
         interface MulterFile {

diff --git a/packages/itmat-interface/jest.config.ts b/packages/itmat-interface/jest.config.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 export default {
     displayName: 'itmat-interface',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     verbose: true,
     transform: {
         '^.+\\.[tj]s$': ['ts-jest', {

diff --git a/packages/itmat-interface/project.json b/packages/itmat-interface/project.json
@@ -17,7 +17,7 @@
                 "main": "packages/itmat-interface/src/index.ts",
                 "tsConfig": "packages/itmat-interface/tsconfig.app.json",
                 "assets": [],
-                "webpackConfig": "packages/itmat-interface/webpack.config.js"
+                "webpackConfig": "packages/itmat-interface/webpack.config.cjs"
             },
             "configurations": {
                 "production": {

diff --git a/packages/itmat-interface/src/index.ts b/packages/itmat-interface/src/index.ts
@@ -69,7 +69,8 @@ function serverSpinning() {
             console.info(`Shuting down api server ${process.pid} ...`);
             interfaceRouter?.on('close', () => {
                 serverStart();
-            }) || serverStart();
+            });
+            serverStart();
         });
     } else {
         serverStart();

diff --git a/packages/itmat-interface/src/server/helper.ts b/packages/itmat-interface/src/server/helper.ts
@@ -7,7 +7,6 @@ import configManager from '../utils/configManager';
 import { CreateNextContextOptions } from '@trpc/server/adapters/next';
 import { inferAsyncReturnType, initTRPC } from '@trpc/server';
 
-
 export class APICalls {
     permissionCore: PermissionCore;
     fileCore: FileCore;
@@ -53,15 +52,15 @@ export class APICalls {
     }
 
     _listOfTRPCRouters() {
-        const createtRPCContext = async (opts: CreateNextContextOptions) => {
+        const __unusedCreatetRPCContext = async (opts: CreateNextContextOptions) => {
             return {
                 user: opts.req.user,
                 req: opts.req,
                 res: opts.res
             };
         };
 
-        type Context = inferAsyncReturnType<typeof createtRPCContext>;
+        type Context = inferAsyncReturnType<typeof __unusedCreatetRPCContext>;
         const t = initTRPC.context<Context>().create();
         const baseProcedure = t.procedure.use(async (opts) => {
             return await tRPCBaseProcedureMilldeware(db, opts);