refactor(core): Enable import/order eslint rule

packages/cli/.eslintrc.js

@@ -28,7 +28,17 @@ module.exports = {
 
 		// TODO: Remove this
 		'import/no-cycle': 'warn',
-		'import/order': 'off',
+		'import/order': [
+			'error',
+			{
+				alphabetize: {
+					order: 'asc',
+					caseInsensitive: true,
+				},
+				groups: [['builtin', 'external'], 'internal', ['parent', 'index', 'sibling'], 'object'],
+				'newlines-between': 'always',
+			},
+		],
 		'import/extensions': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
 		'@typescript-eslint/no-explicit-any': 'warn',

packages/cli/src/__tests__/active-executions.test.ts

@@ -1,15 +1,16 @@
-import { ActiveExecutions } from '@/active-executions';
-import PCancelable from 'p-cancelable';
-import { v4 as uuid } from 'uuid';
+import { mock } from 'jest-mock-extended';
 import type {
 	IExecuteResponsePromiseData,
 	IRun,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
 import { createDeferredPromise } from 'n8n-workflow';
-import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { mock } from 'jest-mock-extended';
+import PCancelable from 'p-cancelable';
+import { v4 as uuid } from 'uuid';
+
+import { ActiveExecutions } from '@/active-executions';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { mockInstance } from '@test/mocking';
 
 const FAKE_EXECUTION_ID = '15';

packages/cli/src/__tests__/credential-types.test.ts

@@ -1,5 +1,6 @@
-import { CredentialTypes } from '@/credential-types';
 import { Container } from 'typedi';
+
+import { CredentialTypes } from '@/credential-types';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { mockInstance } from '@test/mocking';
 

packages/cli/src/__tests__/credentials-helper.test.ts

@@ -1,4 +1,3 @@
-import Container from 'typedi';
 import type {
 	IAuthenticateGeneric,
 	ICredentialDataDecryptedObject,
@@ -9,11 +8,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 import { Workflow } from 'n8n-workflow';
+import Container from 'typedi';
+
 import { CredentialsHelper } from '@/credentials-helper';
-import { NodeTypes } from '@/node-types';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { NodeTypes } from '@/node-types';
 import { mockInstance } from '@test/mocking';
 
 describe('CredentialsHelper', () => {

packages/cli/src/__tests__/license.test.ts

@@ -1,12 +1,13 @@
 import { LicenseManager } from '@n8n_io/license-sdk';
-import { InstanceSettings } from 'n8n-core';
 import { mock } from 'jest-mock-extended';
+import { InstanceSettings } from 'n8n-core';
+
 import config from '@/config';
+import { N8N_VERSION } from '@/constants';
 import { License } from '@/license';
 import { Logger } from '@/logger';
-import { N8N_VERSION } from '@/constants';
-import { mockInstance } from '@test/mocking';
 import { OrchestrationService } from '@/services/orchestration.service';
+import { mockInstance } from '@test/mocking';
 
 jest.mock('@n8n_io/license-sdk');
 

packages/cli/src/__tests__/wait-tracker.test.ts

@@ -1,9 +1,10 @@
-import { WaitTracker } from '@/wait-tracker';
 import { mock } from 'jest-mock-extended';
+
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { IExecutionResponse } from '@/interfaces';
-import { OrchestrationService } from '@/services/orchestration.service';
 import type { MultiMainSetup } from '@/services/orchestration/main/multi-main-setup.ee';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { WaitTracker } from '@/wait-tracker';
 
 jest.useFakeTimers();
 

packages/cli/src/__tests__/workflow-execute-additional-data.test.ts

@@ -1,10 +1,11 @@
-import { VariablesService } from '@/environments/variables/variables.service.ee';
-import { mockInstance } from '@test/mocking';
-import { getBase } from '@/workflow-execute-additional-data';
 import Container from 'typedi';
+
 import { CredentialsHelper } from '@/credentials-helper';
-import { SecretsHelper } from '@/secrets-helpers';
+import { VariablesService } from '@/environments/variables/variables.service.ee';
 import { EventService } from '@/events/event.service';
+import { SecretsHelper } from '@/secrets-helpers';
+import { getBase } from '@/workflow-execute-additional-data';
+import { mockInstance } from '@test/mocking';
 
 describe('WorkflowExecuteAdditionalData', () => {
 	const variablesService = mockInstance(VariablesService);

packages/cli/src/__tests__/workflow-helpers.test.ts

@@ -1,4 +1,5 @@
 import type { Workflow, IWorkflowExecutionDataProcess } from 'n8n-workflow';
+
 import { getExecutionStartNode } from '@/workflow-helpers';
 
 describe('WorkflowHelpers', () => {

packages/cli/src/__tests__/workflow-runner.test.ts

@@ -1,16 +1,16 @@
-import Container from 'typedi';
 import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow';
+import Container from 'typedi';
+
+import config from '@/config';
 import type { User } from '@/databases/entities/user';
+import { Telemetry } from '@/telemetry';
 import { WorkflowRunner } from '@/workflow-runner';
-import config from '@/config';
-
-import * as testDb from '@test-integration/test-db';
-import { setupTestServer } from '@test-integration/utils';
+import { mockInstance } from '@test/mocking';
+import { createExecution } from '@test-integration/db/executions';
 import { createUser } from '@test-integration/db/users';
 import { createWorkflow } from '@test-integration/db/workflows';
-import { createExecution } from '@test-integration/db/executions';
-import { mockInstance } from '@test/mocking';
-import { Telemetry } from '@/telemetry';
+import * as testDb from '@test-integration/test-db';
+import { setupTestServer } from '@test-integration/utils';
 
 let owner: User;
 let runner: WorkflowRunner;

packages/cli/src/abstract-server.ts

@@ -1,28 +1,29 @@
-import { Container, Service } from 'typedi';
-import { readFile } from 'fs/promises';
-import type { Server } from 'http';
+import { GlobalConfig } from '@n8n/config';
+import compression from 'compression';
 import express from 'express';
 import { engine as expressHandlebars } from 'express-handlebars';
-import compression from 'compression';
+import { readFile } from 'fs/promises';
+import type { Server } from 'http';
 import isbot from 'isbot';
+import { Container, Service } from 'typedi';
 
 import config from '@/config';
 import { N8N_VERSION, TEMPLATES_DIR, inDevelopment, inTest } from '@/constants';
 import * as Db from '@/db';
-import { N8nInstanceType } from '@/interfaces';
+import { OnShutdown } from '@/decorators/on-shutdown';
 import { ExternalHooks } from '@/external-hooks';
-import { send, sendErrorResponse } from '@/response-helper';
+import { N8nInstanceType } from '@/interfaces';
+import { Logger } from '@/logger';
 import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
+import { send, sendErrorResponse } from '@/response-helper';
 import { WaitingForms } from '@/waiting-forms';
+import { LiveWebhooks } from '@/webhooks/live-webhooks';
 import { TestWebhooks } from '@/webhooks/test-webhooks';
 import { WaitingWebhooks } from '@/webhooks/waiting-webhooks';
 import { createWebhookHandlerFor } from '@/webhooks/webhook-request-handler';
-import { LiveWebhooks } from '@/webhooks/live-webhooks';
+
 import { generateHostInstanceId } from './databases/utils/generators';
-import { Logger } from '@/logger';
 import { ServiceUnavailableError } from './errors/response-errors/service-unavailable.error';
-import { OnShutdown } from '@/decorators/on-shutdown';
-import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export abstract class AbstractServer {

packages/cli/src/activation-errors.service.ts

@@ -1,4 +1,5 @@
 import { Service } from 'typedi';
+
 import { CacheService } from '@/services/cache/cache.service';
 
 @Service()

packages/cli/src/active-executions.ts

@@ -1,5 +1,3 @@
-import { Service } from 'typedi';
-import type PCancelable from 'p-cancelable';
 import type {
 	IDeferredPromise,
 	IExecuteResponsePromiseData,
@@ -14,16 +12,19 @@ import {
 	sleep,
 } from 'n8n-workflow';
 import { strict as assert } from 'node:assert';
+import type PCancelable from 'p-cancelable';
+import { Service } from 'typedi';
 
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type {
 	ExecutionPayload,
 	IExecutingWorkflowData,
 	IExecutionDb,
 	IExecutionsCurrentSummary,
 } from '@/interfaces';
-import { isWorkflowIdValid } from '@/utils';
-import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { Logger } from '@/logger';
+import { isWorkflowIdValid } from '@/utils';
+
 import { ConcurrencyControlService } from './concurrency/concurrency-control.service';
 import config from './config';
 

packages/cli/src/active-workflow-manager.ts

@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import { Service } from 'typedi';
 import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
-
 import type {
 	ExecutionError,
 	IDeferredPromise,
@@ -25,30 +23,31 @@ import {
 	WebhookPathTakenError,
 	ApplicationError,
 } from 'n8n-workflow';
+import { Service } from 'typedi';
 
-import type { IWorkflowDb } from '@/interfaces';
-import * as WebhookHelpers from '@/webhooks/webhook-helpers';
-import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
-
-import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import { ActivationErrorsService } from '@/activation-errors.service';
 import { ActiveExecutions } from '@/active-executions';
-import { ExecutionService } from './executions/execution.service';
 import {
 	STARTING_NODES,
 	WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
 	WORKFLOW_REACTIVATE_MAX_TIMEOUT,
 } from '@/constants';
-import { NodeTypes } from '@/node-types';
-import { ExternalHooks } from '@/external-hooks';
-import { WebhookService } from '@/webhooks/webhook.service';
-import { Logger } from './logger';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { OrchestrationService } from '@/services/orchestration.service';
-import { ActivationErrorsService } from '@/activation-errors.service';
+import { OnShutdown } from '@/decorators/on-shutdown';
+import { ExternalHooks } from '@/external-hooks';
+import type { IWorkflowDb } from '@/interfaces';
+import { NodeTypes } from '@/node-types';
 import { ActiveWorkflowsService } from '@/services/active-workflows.service';
+import { OrchestrationService } from '@/services/orchestration.service';
+import * as WebhookHelpers from '@/webhooks/webhook-helpers';
+import { WebhookService } from '@/webhooks/webhook.service';
+import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
-import { OnShutdown } from '@/decorators/on-shutdown';
+
+import { ExecutionService } from './executions/execution.service';
+import { Logger } from './logger';
 
 interface QueuedActivation {
 	activationMode: WorkflowActivateMode;

packages/cli/src/auth/__tests__/auth.service.test.ts

@@ -1,16 +1,16 @@
-import jwt from 'jsonwebtoken';
-import { mock } from 'jest-mock-extended';
 import type { NextFunction, Response } from 'express';
+import { mock } from 'jest-mock-extended';
+import jwt from 'jsonwebtoken';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { AUTH_COOKIE_NAME, Time } from '@/constants';
 import type { User } from '@/databases/entities/user';
 import type { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
 import type { UserRepository } from '@/databases/repositories/user.repository';
+import type { AuthenticatedRequest } from '@/requests';
 import { JwtService } from '@/services/jwt.service';
 import type { UrlService } from '@/services/url.service';
-import type { AuthenticatedRequest } from '@/requests';
 
 describe('AuthService', () => {
 	config.set('userManagement.jwtSecret', 'random-secret');

packages/cli/src/auth/auth.service.ts

@@ -1,7 +1,8 @@
-import Container, { Service } from 'typedi';
-import type { NextFunction, Response } from 'express';
+import { GlobalConfig } from '@n8n/config';
 import { createHash } from 'crypto';
+import type { NextFunction, Response } from 'express';
 import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
+import Container, { Service } from 'typedi';
 
 import config from '@/config';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
@@ -15,7 +16,6 @@ import { Logger } from '@/logger';
 import type { AuthenticatedRequest } from '@/requests';
 import { JwtService } from '@/services/jwt.service';
 import { UrlService } from '@/services/url.service';
-import { GlobalConfig } from '@n8n/config';
 
 interface AuthJwtPayload {
 	/** User Id */

packages/cli/src/auth/jwt.ts

@@ -1,7 +1,8 @@
-import { Container } from 'typedi';
 import type { Response } from 'express';
+import { Container } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
+
 import { AuthService } from './auth.service';
 
 // This method is still used by cloud hooks.

packages/cli/src/auth/methods/email.ts

@@ -1,10 +1,11 @@
-import type { User } from '@/databases/entities/user';
-import { PasswordUtility } from '@/services/password.utility';
 import { Container } from 'typedi';
-import { isLdapLoginEnabled } from '@/ldap/helpers.ee';
+
+import type { User } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { EventService } from '@/events/event.service';
+import { isLdapLoginEnabled } from '@/ldap/helpers.ee';
+import { PasswordUtility } from '@/services/password.utility';
 
 export const handleEmailLogin = async (
 	email: string,

packages/cli/src/auth/methods/ldap.ts

@@ -1,6 +1,7 @@
 import { Container } from 'typedi';
 
-import { LdapService } from '@/ldap/ldap.service.ee';
+import type { User } from '@/databases/entities/user';
+import { EventService } from '@/events/event.service';
 import {
 	createLdapUserOnLocalDb,
 	getUserByEmail,
@@ -10,8 +11,7 @@ import {
 	createLdapAuthIdentity,
 	updateLdapUserOnLocalDb,
 } from '@/ldap/helpers.ee';
-import type { User } from '@/databases/entities/user';
-import { EventService } from '@/events/event.service';
+import { LdapService } from '@/ldap/ldap.service.ee';
 
 export const handleLdapLogin = async (
 	loginId: string,

packages/cli/src/collaboration/__tests__/collaboration.state.test.ts

@@ -1,7 +1,9 @@
-import { CollaborationState } from '../collaboration.state';
-import type { CacheService } from '@/services/cache/cache.service';
 import { mock } from 'jest-mock-extended';
 
+import type { CacheService } from '@/services/cache/cache.service';
+
+import { CollaborationState } from '../collaboration.state';
+
 const origDate = global.Date;
 
 const mockDateFactory = (currentDate: string) => {

packages/cli/src/collaboration/collaboration.service.ts

@@ -1,13 +1,13 @@
-import { Service } from 'typedi';
 import type { Workflow } from 'n8n-workflow';
 import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
+import { Service } from 'typedi';
 
-import { Push } from '@/push';
+import { CollaborationState } from '@/collaboration/collaboration.state';
+import type { User } from '@/databases/entities/user';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import type { ICollaboratorsChanged } from '@/interfaces';
+import { Push } from '@/push';
 import type { OnPushMessage } from '@/push/types';
-import { UserRepository } from '@/databases/repositories/user.repository';
-import type { User } from '@/databases/entities/user';
-import { CollaborationState } from '@/collaboration/collaboration.state';
 import { AccessService } from '@/services/access.service';
 
 import type { WorkflowClosedMessage, WorkflowOpenedMessage } from './collaboration.message';