Merge pull request #1444 from Hexastack/fix/api-lint-add-rule-2025-11-05

fix(api): update eslint padding-line-between-statements rule

Author: marrouchi

packages/api/eslint.config.cjs

@@ -79,6 +79,8 @@ const createConfig = ({ headerYear = '2025' } = {}) => {
           2,
           { blankLine: 'always', prev: '*', next: 'export' },
           { blankLine: 'always', prev: '*', next: 'function' },
+          { blankLine: 'always', prev: '*', next: 'return' },
+          { blankLine: 'never', prev: 'const', next: 'const' },
         ],
         'lines-between-class-members': ['warn', 'always'],
         'no-console': 2,

packages/api/src/analytics/controllers/bot-stats.controller.ts

@@ -50,6 +50,7 @@ export class BotStatsController extends BaseOrmController<
       BotStatsType.outgoing,
     ];
     const result = await this.botStatsService.findMessages(from, to, types);
+
     return BotStatsOrmEntity.toLines(result, types);
   }
 
@@ -86,8 +87,8 @@ export class BotStatsController extends BaseOrmController<
       BotStatsType.new_conversations,
       BotStatsType.existing_conversations,
     ];
-
     const result = await this.botStatsService.findMessages(from, to, types);
+
     return BotStatsOrmEntity.toLines(result, types);
   }
 
@@ -108,8 +109,8 @@ export class BotStatsController extends BaseOrmController<
       BotStatsType.returning_users,
       BotStatsType.retention,
     ];
-
     const result = await this.botStatsService.findMessages(from, to, types);
+
     return BotStatsOrmEntity.toLines(result, types);
   }
 

packages/api/src/analytics/entities/bot-stats.entity.ts

@@ -73,19 +73,19 @@ export class BotStatsOrmEntity extends BaseOrmEntity {
         values: [],
       } as ToLinesType;
     });
-
     const index: { [dataName: string]: number } = data.reduce(
       (acc, curr, i) => {
         acc[curr.name] = i;
+
         return acc;
       },
       {},
     );
-
     const result = stats.reduce(
       (acc, stat: BotStatsOrmEntity & { date: Date }) => {
         stat.date = stat.day;
         acc[index[stat.type]].values.push(stat);
+
         return acc;
       },
       data,

packages/api/src/analytics/services/bot-stats.service.spec.ts

@@ -36,6 +36,7 @@ describe('BotStatsService', () => {
       if (leftTime !== rightTime) {
         return leftTime - rightTime;
       }
+
       return left.type.localeCompare(right.type);
     });
 
@@ -186,7 +187,6 @@ describe('BotStatsService', () => {
         assignedToId: null,
         ...partial,
       }) as unknown as SubscriberOrmEntity;
-
     const buildEvent = ({
       entity,
       databaseEntity,

packages/api/src/analytics/validation-rules/is-less-than-date.ts

@@ -27,6 +27,7 @@ export function IsLessThanDate(
           if (relatedValue) {
             return value <= relatedValue;
           }
+
           return true;
         },
       },

packages/api/src/app.controller.ts

@@ -44,6 +44,7 @@ export class AppController {
   @Get('__getcookie')
   cookies(@Req() req: Request): string {
     req.session.anonymous = true;
+
     return '';
   }
 }

packages/api/src/app.instance.ts

@@ -17,6 +17,7 @@ export class AppInstance {
     if (!this.app) {
       throw new Error('App instance has not been set yet.');
     }
+
     return this.app;
   }
 

packages/api/src/attachment/controllers/attachment.controller.spec.ts

@@ -104,7 +104,6 @@ describe('AttachmentController', () => {
     it('should forward TypeORM options to the service', async () => {
       const findSpy = jest.spyOn(attachmentService, 'find');
       const name = attachmentFixtures[0].name;
-
       const options = {
         where: { name },
         take: 5,
@@ -127,7 +126,6 @@ describe('AttachmentController', () => {
     it('should count attachments', async () => {
       const countSpy = jest.spyOn(attachmentService, 'count');
       const name = attachmentFixtures[0].name;
-
       const result = await attachmentController.filterCount({
         where: { name },
       });

packages/api/src/attachment/controllers/attachment.controller.ts

@@ -79,6 +79,7 @@ export class AttachmentController extends BaseOrmController<
       this.logger.warn(`Unable to find Attachment by id ${id}`);
       throw new NotFoundException(`Attachment with ID ${id} not found`);
     }
+
     return attachment;
   }
 

packages/api/src/attachment/guards/attachment-ability.guard.spec.ts

@@ -41,14 +41,12 @@ describe('AttachmentGuard', () => {
     subscriber: 'subscriber-model-id',
     user: 'user-model-id',
   };
-
   const buildContext = (request: Partial<Request>) =>
     ({
       switchToHttp: jest.fn().mockReturnValue({
         getRequest: jest.fn().mockReturnValue(request),
       }),
     }) as unknown as ExecutionContext;
-
   const mockModelFindOne = () =>
     jest.spyOn(modelService, 'findOne').mockImplementation((criteria) => {
       const identity = (criteria as { where?: { identity?: TModel } }).where
@@ -60,6 +58,7 @@ describe('AttachmentGuard', () => {
           new Error(`Unexpected model identity: ${identity}`),
         );
       }
+
       return Promise.resolve({
         id,
         identity,
@@ -98,18 +97,15 @@ describe('AttachmentGuard', () => {
     it('should allow GET requests with valid ref', async () => {
       const mockUser = { roles: ['admin-id'] } as any;
       const mockRef = [AttachmentResourceRef.UserAvatar];
-
       const modelFindOne = mockModelFindOne();
       const permissionFindOne = jest
         .spyOn(permissionService, 'findOne')
         .mockResolvedValue({} as Permission);
-
       const mockExecutionContext = buildContext({
         query: { where: { resourceRef: mockRef } },
         method: 'GET',
         user: mockUser,
       });
-
       const result = await guard.canActivate(mockExecutionContext);
       expect(result).toBe(true);
 
@@ -152,13 +148,11 @@ describe('AttachmentGuard', () => {
       const permissionFindOne = jest
         .spyOn(permissionService, 'findOne')
         .mockResolvedValue({} as Permission);
-
       const mockExecutionContext = buildContext({
         params: { id: attachmentId },
         method: 'GET',
         user: mockUser,
       });
-
       const result = await guard.canActivate(mockExecutionContext);
       expect(result).toBe(true);
 
@@ -180,18 +174,15 @@ describe('AttachmentGuard', () => {
 
     it('should allow POST requests with a valid ref', async () => {
       const mockUser = { roles: ['editor-id'] } as any;
-
       const modelFindOne = mockModelFindOne();
       const permissionFindOne = jest
         .spyOn(permissionService, 'findOne')
         .mockResolvedValue({} as Permission);
-
       const mockExecutionContext = buildContext({
         query: { resourceRef: AttachmentResourceRef.BlockAttachment },
         method: 'POST',
         user: mockUser,
       });
-
       const result = await guard.canActivate(mockExecutionContext);
       expect(result).toBe(true);
 
@@ -241,7 +232,6 @@ describe('AttachmentGuard', () => {
 
     it('should allow DELETE requests with valid attachment and context', async () => {
       const mockUser = { roles: ['admin-id'] } as any;
-
       const attachmentWithUuid = {
         ...attachment,
         id: '5a1ea13e-63ef-48da-9afb-7b4d0533b1a0',
@@ -255,13 +245,11 @@ describe('AttachmentGuard', () => {
       const permissionFindOne = jest
         .spyOn(permissionService, 'findOne')
         .mockResolvedValue({} as Permission);
-
       const mockExecutionContext = buildContext({
         method: 'DELETE',
         params: { id: attachmentWithUuid.id },
         user: mockUser,
       });
-
       const result = await guard.canActivate(mockExecutionContext);
       expect(result).toBe(true);