chore: import order

radoslavirha · Jan 6, 2024 · b09671e · b09671e
1 parent dcf502e
commit b09671e
Show file tree

Hide file tree

Showing 34 changed files with 228 additions and 121 deletions.
diff --git a/api/authentication/package.json b/api/authentication/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "bootstrap": "pnpm run config:api && pnpm run keys",
     "build": "pnpm run barrels && tsc --project tsconfig.compile.json",
-    "barrels": "barrelsby --config .barrelsby.json",
+    "barrels": "barrelsby --config .barrelsby.json && eslint --fix src/**/index.ts",
     "start": "pnpm run copy:views && pnpm run barrels && NODE_ENV=localhost tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts",
     "start:prod": "pnpm run copy:views && cross-env NODE_ENV=production node dist/index.js",
     "format": "eslint --ext .ts --fix src",

diff --git a/api/authentication/src/Server.ts b/api/authentication/src/Server.ts
@@ -1,3 +1,4 @@
+import { join } from 'path';
 import * as restCommon from '@hikers-book/tsed-common/controllers';
 import { BaseServer, getServerDefaultConfig, getSwaggerHelmetDirectives } from '@hikers-book/tsed-common/server';
 import '@tsed/ajv';
@@ -9,7 +10,6 @@ import '@tsed/platform-express'; // /!\ keep this import
 import '@tsed/swagger';
 import cookieSession from 'cookie-session';
 import helmet from 'helmet';
-import { join } from 'path';
 import * as restAuth from './auth/controllers/index';
 import { User } from './auth/models';
 import './auth/protocols/EmailSignInProtocol';

diff --git a/api/authentication/src/auth/controllers/EmailController.integration.spec.ts b/api/authentication/src/auth/controllers/EmailController.integration.spec.ts
@@ -5,10 +5,10 @@ import { TestAuthenticationApiContext } from '../../test/TestAuthenticationApiCo
 import { EmailVerifyTokenHandler } from '../handlers';
 import { EmailSendVerificationRequest, EmailSignUpRequest, EmailVerifyTokenRequest } from '../models';
 import { EmailService } from '../services/EmailService';
-import { ProtocolAuthService } from '../services/ProtocolAuthService';
-import { RefreshTokenService } from '../services/RefreshTokenService';
 import { CredentialsMongoService } from '../services/mongo/CredentialsMongoService';
 import { EmailVerificationMongoService } from '../services/mongo/EmailVerificationMongoService';
+import { ProtocolAuthService } from '../services/ProtocolAuthService';
+import { RefreshTokenService } from '../services/RefreshTokenService';
 import { CredentialsStub, EmailVerificationStub, TokensStub } from '../test/stubs';
 import { CryptographyUtils } from '../utils';
 import { AuthProviderEmailController } from './EmailController';

diff --git a/api/authentication/src/auth/handlers/LogoutHandler.ts b/api/authentication/src/auth/handlers/LogoutHandler.ts
@@ -1,7 +1,7 @@
 import { BaseHandler } from '@hikers-book/tsed-common/handlers';
 import { Req } from '@tsed/common';
-import { RefreshTokenService } from '../services/RefreshTokenService';
 import { Injectable } from '@tsed/di';
+import { RefreshTokenService } from '../services/RefreshTokenService';
 
 @Injectable()
 export class LogoutHandler extends BaseHandler<{ request: Req; refreshToken: string }, void> {

diff --git a/api/authentication/src/auth/services/KeysService.spec.ts b/api/authentication/src/auth/services/KeysService.spec.ts
@@ -1,7 +1,7 @@
+import path from 'path';
 import { FSUtils } from '@hikers-book/tsed-common/utils';
 import { PlatformTest } from '@tsed/common';
 import { TestMongooseContext } from '@tsed/testing-mongoose';
-import path from 'path';
 import { KeysService } from './KeysService';
 
 describe('KeysService', () => {

diff --git a/api/authentication/src/auth/services/KeysService.ts b/api/authentication/src/auth/services/KeysService.ts
@@ -1,7 +1,7 @@
+import path from 'path';
 import { FSUtils } from '@hikers-book/tsed-common/utils';
 import { Service } from '@tsed/di';
 import { Algorithm } from 'jsonwebtoken';
-import path from 'path';
 
 @Service()
 export class KeysService {

diff --git a/api/authentication/src/auth/services/ProtocolAuthService.spec.ts b/api/authentication/src/auth/services/ProtocolAuthService.spec.ts
@@ -22,11 +22,11 @@ import {
 import { ProviderGithubPair } from '../types';
 import { CryptographyUtils } from '../utils';
 import { JWTService } from './JWTService';
-import { ProtocolAuthService } from './ProtocolAuthService';
-import { RefreshTokenService } from './RefreshTokenService';
 import { CredentialsMongoService } from './mongo/CredentialsMongoService';
 import { EmailVerificationMongoService } from './mongo/EmailVerificationMongoService';
 import { UserMongoService } from './mongo/UserMongoService';
+import { ProtocolAuthService } from './ProtocolAuthService';
+import { RefreshTokenService } from './RefreshTokenService';
 
 describe('ProtocolAuthService', () => {
   let service: ProtocolAuthService;

diff --git a/api/authentication/src/auth/services/ProtocolAuthService.ts b/api/authentication/src/auth/services/ProtocolAuthService.ts
@@ -13,10 +13,10 @@ import { Credentials, EmailSignUpRequest, RefreshToken, TokensPair, User } from
 import { AuthProviderPair, OAuth2ProviderPair } from '../types';
 import { CryptographyUtils } from '../utils/CryptographyUtils';
 import { JWTService } from './JWTService';
-import { RefreshTokenService } from './RefreshTokenService';
 import { CredentialsMongoService } from './mongo/CredentialsMongoService';
 import { EmailVerificationMongoService } from './mongo/EmailVerificationMongoService';
 import { UserMongoService } from './mongo/UserMongoService';
+import { RefreshTokenService } from './RefreshTokenService';
 
 @Service()
 export class ProtocolAuthService {

diff --git a/api/authentication/src/auth/services/RefreshTokenService.spec.ts b/api/authentication/src/auth/services/RefreshTokenService.spec.ts
@@ -9,9 +9,9 @@ import { TestAuthenticationApiContext } from '../../test/TestAuthenticationApiCo
 import { CookieName, RefreshToken } from '../models';
 import { CredentialsStubPopulated, RefreshTokenStub, TokensStub } from '../test/stubs';
 import { JWTService } from './JWTService';
-import { RefreshTokenService } from './RefreshTokenService';
 import { CredentialsMongoService } from './mongo/CredentialsMongoService';
 import { RefreshTokenMongoService } from './mongo/RefreshTokenMongoService';
+import { RefreshTokenService } from './RefreshTokenService';
 
 describe('RefreshTokenService', () => {
   let service: RefreshTokenService;

diff --git a/api/authentication/src/auth/utils/CryptographyUtils.ts b/api/authentication/src/auth/utils/CryptographyUtils.ts
@@ -1,6 +1,7 @@
-import { argon2id, hash, Options, verify } from 'argon2';
 import { randomBytes } from 'crypto';
+import { argon2id, hash, Options, verify } from 'argon2';
 import { v4 } from 'uuid';
+
 export class CryptographyUtils {
   public static async argon2CreateHash(password: string): Promise<string> {
     const hashingConfig: Partial<Options & { raw?: false }> = {

diff --git a/api/authentication/src/global/services/ConfigService.ts b/api/authentication/src/global/services/ConfigService.ts
@@ -1,7 +1,7 @@
+import { resolve } from 'path';
 import { ConfigLoaderOptions, ConfigLoder, SwaggerDocConfig } from '@hikers-book/tsed-common/config';
 import { SwaggerDocsVersion, SwaggerSecurityScheme } from '@hikers-book/tsed-common/types';
 import { Injectable } from '@tsed/di';
-import { resolve } from 'path';
 import { ConfigModel } from '../models/ConfigModel';
 
 @Injectable()

diff --git a/api/authentication/src/index.ts b/api/authentication/src/index.ts
@@ -2,8 +2,8 @@ import { ConfigLoder } from '@hikers-book/tsed-common/config';
 import { $log } from '@tsed/common';
 import { PlatformExpress } from '@tsed/platform-express';
 import { SwaggerSettings } from '@tsed/swagger';
-import { Server } from './Server';
 import { ConfigService } from './global/services/ConfigService';
+import { Server } from './Server';
 
 async function bootstrap() {
   try {

diff --git a/api/authentication/src/test/TestAuthenticationApiContext.ts b/api/authentication/src/test/TestAuthenticationApiContext.ts
@@ -1,9 +1,9 @@
 import { AT_PRIVATE_KEY, AT_PUBLIC_KEY, RT_PRIVATE_KEY, RT_PUBLIC_KEY } from '@hikers-book/tsed-common/stubs';
 import { TestMongooseContext } from '@tsed/testing-mongoose';
 import { createTransport } from 'nodemailer-mock';
-import { Server } from '../Server';
 import { KeysService } from '../auth/services/KeysService';
 import { NODEMAILER_TOKEN } from '../global/connections/InjectionToken';
+import { Server } from '../Server';
 
 // istanbul ignore next
 export class TestAuthenticationApiContext {

diff --git a/api/graphql/package.json b/api/graphql/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "build": "pnpm run barrels && tsc --project tsconfig.compile.json",
-    "barrels": "barrelsby --config .barrelsby.json",
+    "barrels": "barrelsby --config .barrelsby.json && eslint --fix src/**/index.ts",
     "start": "pnpm run barrels && NODE_ENV=localhost tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts",
     "start:prod": "cross-env NODE_ENV=production node dist/index.js",
     "format": "eslint --ext .ts --fix src",

diff --git a/api/graphql/src/Server.ts b/api/graphql/src/Server.ts
@@ -1,11 +1,11 @@
+import { resolve } from 'path';
 import { BaseServer, getServerDefaultConfig } from '@hikers-book/tsed-common/server';
 import '@tsed/ajv';
 import { Configuration, Inject } from '@tsed/di';
 import '@tsed/ioredis';
 import '@tsed/platform-express'; // /!\ keep this import
 import cookieSession from 'cookie-session';
 import helmet from 'helmet';
-import { resolve } from 'path';
 import './global/connections/Redis';
 import { ConfigService } from './global/services/ConfigService';
 import * as v1Datasources from './v1/datasources';

diff --git a/api/graphql/src/index.ts b/api/graphql/src/index.ts
@@ -1,8 +1,8 @@
 import { ConfigLoder } from '@hikers-book/tsed-common/config';
 import { $log } from '@tsed/common';
 import { PlatformExpress } from '@tsed/platform-express';
-import { Server } from './Server';
 import { ConfigService } from './global/services/ConfigService';
+import { Server } from './Server';
 
 async function bootstrap() {
   try {

diff --git a/api/stages/package.json b/api/stages/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "build": "pnpm run barrels && tsc --project tsconfig.compile.json",
-    "barrels": "barrelsby --config .barrelsby.json",
+    "barrels": "barrelsby --config .barrelsby.json && eslint --fix src/**/index.ts",
     "start": "pnpm run copy:views && pnpm run barrels && NODE_ENV=localhost tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts",
     "start:prod": "pnpm run copy:views && cross-env NODE_ENV=production node dist/index.js",
     "format": "eslint --ext .ts --fix src",

diff --git a/api/stages/src/Server.ts b/api/stages/src/Server.ts
@@ -1,3 +1,4 @@
+import { join } from 'path';
 import * as global from '@hikers-book/tsed-common/controllers';
 import { BaseServer, getServerDefaultConfig, getSwaggerHelmetDirectives } from '@hikers-book/tsed-common/server';
 import '@tsed/ajv';
@@ -8,7 +9,6 @@ import '@tsed/platform-express'; // /!\ keep this import
 import '@tsed/swagger';
 import cookieSession from 'cookie-session';
 import helmet from 'helmet';
-import { join } from 'path';
 import './global/connections/Redis';
 import { ConfigService } from './global/services/ConfigService';
 import * as rest from './v1/controllers/index';

diff --git a/api/stages/src/global/services/ConfigService.ts b/api/stages/src/global/services/ConfigService.ts
@@ -1,7 +1,7 @@
+import { resolve } from 'path';
 import { ConfigLoaderOptions, ConfigLoder, SwaggerDocConfig } from '@hikers-book/tsed-common/config';
 import { SwaggerDocsVersion, SwaggerSecurityScheme } from '@hikers-book/tsed-common/types';
 import { Injectable } from '@tsed/di';
-import { resolve } from 'path';
 import { ConfigModel } from '../models/ConfigModel';
 
 @Injectable()

diff --git a/api/stages/src/index.ts b/api/stages/src/index.ts
@@ -2,8 +2,8 @@ import { ConfigLoder } from '@hikers-book/tsed-common/config';
 import { $log } from '@tsed/common';
 import { PlatformExpress } from '@tsed/platform-express';
 import { SwaggerSettings } from '@tsed/swagger';
-import { Server } from './Server';
 import { ConfigService } from './global/services/ConfigService';
+import { Server } from './Server';
 
 async function bootstrap() {
   try {

diff --git a/api/trips/package.json b/api/trips/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "build": "pnpm run barrels && tsc --project tsconfig.compile.json",
-    "barrels": "barrelsby --config .barrelsby.json",
+    "barrels": "barrelsby --config .barrelsby.json && eslint --fix src/**/index.ts",
     "start": "pnpm run copy:views && pnpm run barrels && NODE_ENV=localhost tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts",
     "start:prod": "pnpm run copy:views && cross-env NODE_ENV=production node dist/index.js",
     "format": "eslint --ext .ts --fix src",

diff --git a/api/trips/src/Server.ts b/api/trips/src/Server.ts
@@ -1,3 +1,4 @@
+import { join } from 'path';
 import * as global from '@hikers-book/tsed-common/controllers';
 import { BaseServer, getServerDefaultConfig, getSwaggerHelmetDirectives } from '@hikers-book/tsed-common/server';
 import '@tsed/ajv';
@@ -8,7 +9,6 @@ import '@tsed/platform-express'; // /!\ keep this import
 import '@tsed/swagger';
 import cookieSession from 'cookie-session';
 import helmet from 'helmet';
-import { join } from 'path';
 import './global/connections/Redis';
 import { ConfigService } from './global/services/ConfigService';
 import * as rest from './v1/controllers/index';

diff --git a/api/trips/src/global/services/ConfigService.ts b/api/trips/src/global/services/ConfigService.ts
@@ -1,7 +1,7 @@
+import { resolve } from 'path';
 import { ConfigLoaderOptions, ConfigLoder, SwaggerDocConfig } from '@hikers-book/tsed-common/config';
 import { SwaggerDocsVersion, SwaggerSecurityScheme } from '@hikers-book/tsed-common/types';
 import { Injectable } from '@tsed/di';
-import { resolve } from 'path';
 import { ConfigModel } from '../models/ConfigModel';
 
 @Injectable()

diff --git a/api/trips/src/index.ts b/api/trips/src/index.ts
@@ -2,8 +2,8 @@ import { ConfigLoder } from '@hikers-book/tsed-common/config';
 import { $log } from '@tsed/common';
 import { PlatformExpress } from '@tsed/platform-express';
 import { SwaggerSettings } from '@tsed/swagger';
-import { Server } from './Server';
 import { ConfigService } from './global/services/ConfigService';
+import { Server } from './Server';
 
 async function bootstrap() {
   try {

diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts
@@ -1,5 +1,5 @@
-import chalk from 'chalk';
 import Fs from 'fs';
+import chalk from 'chalk';
 import { mergeObjects } from 'json-merger';
 import logSymbols from 'log-symbols';
 import { CLIConfigOptions } from './types';

diff --git a/packages/cli/src/copy.ts b/packages/cli/src/copy.ts
@@ -1,6 +1,6 @@
 import Fs from 'fs';
-import { globSync } from 'glob';
 import path from 'path';
+import { globSync } from 'glob';
 
 export const copy = (): void => {
   const viewsSource = path.join(__dirname, '../../tsed-common/src/views/');

diff --git a/packages/eslint/index.js b/packages/eslint/index.js
@@ -3,6 +3,8 @@ module.exports = {
   extends: [
     'plugin:@typescript-eslint/recommended',
     'plugin:import/recommended',
+    'plugin:import/typescript',
+    'plugin:import/recommended',
     'plugin:import/typescript'
   ],
   plugins: [ '@stylistic' ],
@@ -11,8 +13,12 @@ module.exports = {
     sourceType: 'module'
   },
   rules: {
-    'max-params': ['error', 3],
     'import/no-named-as-default': 'off',
+    'max-params': ['error', 3],
+    'import/first': 'error',
+    'import/newline-after-import': 'error',
+    'import/no-duplicates': 'error',
+    'import/order': ['error', { alphabetize: { order: 'asc', caseInsensitive: true } }],
     '@stylistic/comma-dangle': ['error', 'never'],
     '@stylistic/eol-last': ['error', 'always'],
     '@stylistic/function-call-spacing': ['error', 'never'],

diff --git a/packages/eslint/package.json b/packages/eslint/package.json
@@ -18,7 +18,8 @@
     "eslint-plugin-import": "^2.28.1"
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin": "^1.5.1"
+    "@stylistic/eslint-plugin": "^1.5.1",
+    "eslint-plugin-import": "^2.29.1"
   },
   "engines": {
     "node": ">= 18.0.0",

diff --git a/packages/tsed-common/package.json b/packages/tsed-common/package.json
@@ -19,7 +19,7 @@
   },
   "scripts": {
     "build": "pnpm run barrels && npx tsc",
-    "barrels": "barrelsby --config .barrelsby.json",
+    "barrels": "barrelsby --config .barrelsby.json && eslint --fix src/**/index.ts",
     "format": "eslint --ext .ts --fix src",
     "lint": "eslint --ext .ts src",
     "test": "cross-env NODE_ENV=test jest",

diff --git a/packages/tsed-common/src/controllers/SwaggerController.integration.spec.ts b/packages/tsed-common/src/controllers/SwaggerController.integration.spec.ts
@@ -1,6 +1,6 @@
+import { join } from 'path';
 import { PlatformTest } from '@tsed/common';
 import { minify } from 'html-minifier';
-import { join } from 'path';
 import SuperTest from 'supertest';
 import { BaseServer } from '../server/ServerBase';
 import { SwaggerController } from './SwaggerController';

diff --git a/packages/tsed-common/src/protocols/JWTProtocol.integration.spec.ts b/packages/tsed-common/src/protocols/JWTProtocol.integration.spec.ts
@@ -2,8 +2,8 @@ import { PlatformTest } from '@tsed/common';
 import SuperTest from 'supertest';
 import { BaseServer } from '../server/ServerBase';
 import { AuthenticateService } from '../services/AuthenticateService';
-import { TestController } from '../test/TestController';
 import { ACCESS_TOKEN, BEARER_TOKEN, JWT_PAYLOAD } from '../test/stubs/AuthStubs';
+import { TestController } from '../test/TestController';
 
 describe('JWTProtocol', () => {
   let request: SuperTest.SuperTest<SuperTest.Test>;

diff --git a/packages/tsed-common/src/utils/CommonUtils.spec.ts b/packages/tsed-common/src/utils/CommonUtils.spec.ts
@@ -1,6 +1,6 @@
 import JWT from 'jsonwebtoken';
-import { TestModel } from '../test/TestModel';
 import { ACCESS_TOKEN, JWT_PAYLOAD } from '../test/stubs';
+import { TestModel } from '../test/TestModel';
 import { CommonUtils } from './CommonUtils';
 
 describe('CommonUtils', () => {