Merge pull request #3974 from RedisInsight/be/feature/packages-rollback-class-transform

rollback class-transform to 0.3.x (0.3.1)

Author: ArtemHoruzhenko

configs/webpack.config.base.ts

@@ -61,7 +61,7 @@ const configuration: webpack.Configuration =  {
           // 'reflect-metadata',
           // 'swagger-ui-express',
           // 'class-transformer',
-          'class-transformer/storage',
+          // 'class-transformer/storage',
           // '@nestjs/websockets',
           // '@nestjs/core/adapters/http-adapter',
           // '@nestjs/core/helpers/router-method-factory',

redisinsight/api/package.json

@@ -43,33 +43,30 @@
     "nanoid": "^3.1.31",
     "word-wrap": "1.2.4",
     "jest/**/micromatch": "^4.0.8",
-    "ts-loader/micromatch": "^4.0.8",
     "mocha/minimatch": "^3.0.5",
     "@nestjs/serve-static/path-to-regexp": "^1.9.0",
-    "@nestjs/platform-express/express": "^4.21.1",
     "@nestjs/platform-socket.io/socket.io": "^4.8.0",
     "@nestjs/cli/**/braces": "^3.0.3",
-    "@okta/okta-auth-js/**/jsonpath-plus": "^10.0.0",
     "**/semver": "^7.5.2",
     "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
   },
   "dependencies": {
-    "@nestjs/common": "^10.4.4",
-    "@nestjs/core": "^10.4.4",
+    "@nestjs/common": "^10.4.5",
+    "@nestjs/core": "^10.4.5",
     "@nestjs/event-emitter": "^2.0.4",
-    "@nestjs/platform-express": "^10.4.4",
-    "@nestjs/platform-socket.io": "^10.4.4",
+    "@nestjs/platform-express": "^10.4.5",
+    "@nestjs/platform-socket.io": "^10.4.5",
     "@nestjs/serve-static": "^4.0.2",
     "@nestjs/swagger": "^7.4.2",
     "@nestjs/typeorm": "^10.0.2",
-    "@nestjs/websockets": "^10.4.4",
-    "@okta/okta-auth-js": "^7.8.0",
+    "@nestjs/websockets": "^10.4.5",
+    "@okta/okta-auth-js": "^7.8.1",
     "@segment/analytics-node": "^2.1.3",
     "adm-zip": "^0.5.9",
     "axios": "^1.7.4",
     "body-parser": "^1.20.3",
     "busboy": "^1.6.0",
-    "class-transformer": "^0.5.1",
+    "class-transformer": "^0.3.1",
     "class-validator": "^0.14.1",
     "combined-stream": "^1.0.8",
     "connect-timeout": "^1.9.0",
@@ -84,7 +81,7 @@
     "keytar": "^7.9.0",
     "lodash": "^4.17.20",
     "nest-winston": "^1.9.7",
-    "nestjs-form-data": "^1.9.91",
+    "nestjs-form-data": "~1.8.7",
     "node-version-compare": "^1.0.3",
     "quicktype-core": "^23.0.116",
     "redis": "^4.6.10",
@@ -104,8 +101,8 @@
   "devDependencies": {
     "@mochajs/json-file-reporter": "^1.3.0",
     "@nestjs/cli": "^10.4.5",
-    "@nestjs/schematics": "^10.1.4",
-    "@nestjs/testing": "^10.4.4",
+    "@nestjs/schematics": "^10.2.2",
+    "@nestjs/testing": "^10.4.5",
     "@types/adm-zip": "^0.5.0",
     "@types/express": "^4.17.3",
     "@types/jest": "^26.0.15",

redisinsight/api/src/__mocks__/browser-history.ts

@@ -1,4 +1,4 @@
-import { plainToInstance } from 'class-transformer';
+import { plainToClass } from 'class-transformer';
 import { v4 as uuidv4 } from 'uuid';
 import {
   mockDatabase,
@@ -26,7 +26,7 @@ export const mockBrowserHistoryRepository = jest.fn(() => ({
 
 export const mockCreateBrowserHistoryDto: CreateBrowserHistoryDto = {
   mode: BrowserHistoryMode.Pattern,
-  filter: plainToInstance(ScanFilter, {
+  filter: plainToClass(ScanFilter, {
     type: RedisDataType.String,
     match: 'key*',
   }),

redisinsight/api/src/__mocks__/cloud-user.ts

@@ -7,7 +7,7 @@ import {
   ICloudCapiAccount,
 } from 'src/modules/cloud/user/models';
 import config, { Config } from 'src/utils/config';
-import { instanceToPlain } from 'class-transformer';
+import { classToPlain } from 'class-transformer';
 import { mockCloudApiCapiAccessKey, mockCloudCapiAuthDto, mockCloudCapiKey } from 'src/__mocks__/cloud-capi-key';
 import { mockCloudApiAuthDto, mockCloudSession } from 'src/__mocks__/cloud-session';
 
@@ -102,7 +102,7 @@ export const mockCloudUser = Object.assign(new CloudUser(), {
   capiKey: mockCloudCapiKey,
 });
 
-export const mockCloudUserSafe = instanceToPlain(mockCloudUser); // omits all data in the "security" group
+export const mockCloudUserSafe = classToPlain(mockCloudUser); // omits all data in the "security" group
 
 export const mockCloudApiAccount: ICloudApiAccount = {
   id: mockCloudCapiAccount.id,

redisinsight/api/src/common/decorators/client-metadata/client-metadata.decorator.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, createParamDecorator, ExecutionContext } from '@nestjs/common';
-import { plainToInstance } from 'class-transformer';
+import { plainToClass } from 'class-transformer';
 import { ClientContext, ClientMetadata } from 'src/common/models';
 import { Validator } from 'class-validator';
 import { API_HEADER_DATABASE_INDEX, API_PARAM_DATABASE_ID } from 'src/common/constants';
@@ -31,7 +31,7 @@ export const clientMetadataParamFactory = (
     uniqueId = req.params?.[options.uniqueIdParam];
   }
 
-  const clientMetadata = plainToInstance(ClientMetadata, {
+  const clientMetadata = plainToClass(ClientMetadata, {
     sessionMetadata: sessionMetadataFromRequestExecutionContext(undefined, ctx),
     databaseId,
     uniqueId,

redisinsight/api/src/common/decorators/data-as-json-string.decorator.ts

@@ -3,9 +3,9 @@ import { Transform } from 'class-transformer';
 
 export function DataAsJsonString() {
   return applyDecorators(
-    Transform(({ value }) => JSON.stringify(value), { toClassOnly: true }),
+    Transform((value) => JSON.stringify(value), { toClassOnly: true }),
     Transform(
-      ({ value }) => {
+      (value) => {
         try {
           return JSON.parse(value);
         } catch (e) {

redisinsight/api/src/common/decorators/default.ts

@@ -2,5 +2,5 @@ import { Transform } from 'class-transformer';
 import { cloneDeep } from 'lodash';
 
 export function Default(defaultValue: unknown): PropertyDecorator {
-  return Transform(({ value }) => value ?? cloneDeep(defaultValue));
+  return Transform((value) => value ?? cloneDeep(defaultValue));
 }

redisinsight/api/src/common/decorators/hidden-field.decorator.ts

@@ -1,7 +1,7 @@
 import { Transform } from 'class-transformer';
 
 export function HiddenField(field: any): PropertyDecorator {
-  return Transform(({ value }) => (value ? field : undefined), {
+  return Transform((value) => (value ? field : undefined), {
     toPlainOnly: true,
   });
 }

redisinsight/api/src/common/decorators/object-as-map.decorator.ts

@@ -1,17 +1,17 @@
 import { forEach } from 'lodash';
 import { applyDecorators } from '@nestjs/common';
-import { instanceToPlain, plainToInstance, Transform } from 'class-transformer';
-import { ClassConstructor } from 'class-transformer/types/interfaces';
+import { classToPlain, plainToClass, Transform } from 'class-transformer';
+import { ClassType } from 'class-transformer/ClassTransformer';
 
-export function ObjectAsMap<T>(targetClass: ClassConstructor<T>) {
+export function ObjectAsMap<T>(targetClass: ClassType<T>) {
   return applyDecorators(
     Transform(
-      ({ value: object }): Map<string, T> => {
+      (object): Map<string, T> => {
         const result = new Map();
 
         try {
           forEach(object, (value, key) => {
-            result.set(key, plainToInstance(targetClass, value));
+            result.set(key, plainToClass(targetClass, value));
           });
 
           return result;
@@ -22,12 +22,12 @@ export function ObjectAsMap<T>(targetClass: ClassConstructor<T>) {
       { toClassOnly: true },
     ),
     Transform(
-      ({ value: map }): object => {
+      (map): object => {
         try {
           const result = {};
 
           forEach(Array.from(map), ([key, value]) => {
-            result[key] = instanceToPlain(value);
+            result[key] = classToPlain(value);
           });
 
           return result;

redisinsight/api/src/common/decorators/session/session-metadata.decorator.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, createParamDecorator, ExecutionContext } from '@nestjs/common';
-import { plainToInstance } from 'class-transformer';
+import { plainToClass } from 'class-transformer';
 import { Validator } from 'class-validator';
 import { Request } from 'express';
 import { SessionMetadata } from 'src/common/models';
@@ -16,7 +16,7 @@ export const sessionMetadataFromRequest = (request: Request): SessionMetadata =>
   };
 
   // todo: do not forget to deal with session vs sessionMetadata property
-  const session = plainToInstance(SessionMetadata, requestSession);
+  const session = plainToClass(SessionMetadata, requestSession);
 
   const errors = validator.validateSync(session, {
     whitelist: false, // we need this to allow additional fields if needed for flexibility