Skip to content

Commit

Permalink
Change relative import paths to non-relative path aliases (safe-globa…
Browse files Browse the repository at this point in the history
…l#749)

* Change refs to path aliases

* Change more refs to path aliases

* Change all relative imports to non-relative

* Fix bad imports
  • Loading branch information
hectorgomezv authored Oct 13, 2023
1 parent 62882df commit 4729440
Show file tree
Hide file tree
Showing 444 changed files with 1,616 additions and 1,542 deletions.
2 changes: 1 addition & 1 deletion src/app.module.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test } from '@nestjs/testing';
import { AppModule } from './app.module';
import { AppModule } from '@/app.module';

describe('Application bootstrap', () => {
it('should init the app', async () => {
Expand Down
56 changes: 28 additions & 28 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@ import { ClsMiddleware, ClsModule } from 'nestjs-cls';
import { v4 as uuidv4 } from 'uuid';
import { join } from 'path';

import { ChainsModule } from './routes/chains/chains.module';
import { BalancesModule } from './routes/balances/balances.module';
import { NetworkModule } from './datasources/network/network.module';
import { ConfigurationModule } from './config/configuration.module';
import { CacheModule } from './datasources/cache/cache.module';
import { DomainModule } from './domain.module';
import { CacheHooksModule } from './routes/cache-hooks/cache-hooks.module';
import { CollectiblesModule } from './routes/collectibles/collectibles.module';
import { ContractsModule } from './routes/contracts/contracts.module';
import { DataDecodedModule } from './routes/data-decode/data-decoded.module';
import { DelegatesModule } from './routes/delegates/delegates.module';
import { SafeAppsModule } from './routes/safe-apps/safe-apps.module';
import { HealthModule } from './routes/health/health.module';
import { OwnersModule } from './routes/owners/owners.module';
import { AboutModule } from './routes/about/about.module';
import { TransactionsModule } from './routes/transactions/transactions.module';
import { SafesModule } from './routes/safes/safes.module';
import { NotificationsModule } from './routes/notifications/notifications.module';
import { EstimationsModule } from './routes/estimations/estimations.module';
import { MessagesModule } from './routes/messages/messages.module';
import { ValidationModule } from './validation/validation.module';
import { FlushModule } from './routes/flush/flush.module';
import { RequestScopedLoggingModule } from './logging/logging.module';
import { RouteLoggerInterceptor } from './routes/common/interceptors/route-logger.interceptor';
import { NotFoundLoggerMiddleware } from './middleware/not-found-logger.middleware';
import configuration from './config/entities/configuration';
import { GlobalErrorFilter } from './routes/common/filters/global-error.filter';
import { DataSourceErrorFilter } from './routes/common/filters/data-source-error.filter';
import { ChainsModule } from '@/routes/chains/chains.module';
import { BalancesModule } from '@/routes/balances/balances.module';
import { NetworkModule } from '@/datasources/network/network.module';
import { ConfigurationModule } from '@/config/configuration.module';
import { CacheModule } from '@/datasources/cache/cache.module';
import { DomainModule } from '@/domain.module';
import { CacheHooksModule } from '@/routes/cache-hooks/cache-hooks.module';
import { CollectiblesModule } from '@/routes/collectibles/collectibles.module';
import { ContractsModule } from '@/routes/contracts/contracts.module';
import { DataDecodedModule } from '@/routes/data-decode/data-decoded.module';
import { DelegatesModule } from '@/routes/delegates/delegates.module';
import { SafeAppsModule } from '@/routes/safe-apps/safe-apps.module';
import { HealthModule } from '@/routes/health/health.module';
import { OwnersModule } from '@/routes/owners/owners.module';
import { AboutModule } from '@/routes/about/about.module';
import { TransactionsModule } from '@/routes/transactions/transactions.module';
import { SafesModule } from '@/routes/safes/safes.module';
import { NotificationsModule } from '@/routes/notifications/notifications.module';
import { EstimationsModule } from '@/routes/estimations/estimations.module';
import { MessagesModule } from '@/routes/messages/messages.module';
import { ValidationModule } from '@/validation/validation.module';
import { FlushModule } from '@/routes/flush/flush.module';
import { RequestScopedLoggingModule } from '@/logging/logging.module';
import { RouteLoggerInterceptor } from '@/routes/common/interceptors/route-logger.interceptor';
import { NotFoundLoggerMiddleware } from '@/middleware/not-found-logger.middleware';
import configuration from '@/config/entities/configuration';
import { GlobalErrorFilter } from '@/routes/common/filters/global-error.filter';
import { DataSourceErrorFilter } from '@/routes/common/filters/data-source-error.filter';
import { ServeStaticModule } from '@nestjs/serve-static';

// See https://github.com/nestjs/nest/issues/11967
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/fake.configuration.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FakeConfigurationService } from './fake.configuration.service';
import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service';

describe('FakeConfigurationService', () => {
let configurationService: FakeConfigurationService;
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/fake.configuration.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IConfigurationService } from '../configuration.service.interface';
import { IConfigurationService } from '@/config/configuration.service.interface';

export class FakeConfigurationService implements IConfigurationService {
private configuration: Record<string, any> = {};
Expand Down
2 changes: 1 addition & 1 deletion src/config/configuration.module.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { ConfigurationModule } from './configuration.module';
import { ConfigurationModule } from '@/config/configuration.module';

describe('ConfigurationModule', () => {
it(`ConfigurationModule is successfully created`, async () => {
Expand Down
8 changes: 4 additions & 4 deletions src/config/configuration.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { DynamicModule, Global, Module } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
import { IConfigurationService } from './configuration.service.interface';
import { NestConfigurationService } from './nest.configuration.service';
import { validate } from './configuration.validator';
import configuration from './entities/configuration';
import { ConfigFactory } from '@nestjs/config/dist/interfaces/config-factory.interface';
import { IConfigurationService } from '@/config/configuration.service.interface';
import { validate } from '@/config/configuration.validator';
import configuration from '@/config/entities/configuration';
import { NestConfigurationService } from '@/config/nest.configuration.service';

/**
* A {@link Global} Module which provides local configuration support via {@link IConfigurationService}
Expand Down
2 changes: 1 addition & 1 deletion src/config/configuration.validator.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { faker } from '@faker-js/faker';
import { validate } from './configuration.validator';
import { fakeJson } from '@/__tests__/faker';
import { validate } from '@/config/configuration.validator';

describe('Configuration validator', () => {
it('should bypass this validation on tests', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/config/entities/__tests__/configuration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { faker } from '@faker-js/faker';
import configuration from '../../entities/configuration';
import configuration from '@/config/entities/configuration';

export default (): ReturnType<typeof configuration> => ({
about: {
Expand Down
4 changes: 2 additions & 2 deletions src/config/nest.configuration.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NestConfigurationService } from './nest.configuration.service';
import { ConfigService } from '@nestjs/config';
import { NestConfigurationService } from '@/config/nest.configuration.service';
import { faker } from '@faker-js/faker';
import { ConfigService } from '@nestjs/config';

const configService = {
get: jest.fn(),
Expand Down
2 changes: 1 addition & 1 deletion src/config/nest.configuration.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IConfigurationService } from '@/config/configuration.service.interface';
import { Injectable } from '@nestjs/common';
import { ConfigService as NestConfigService } from '@nestjs/config';
import { IConfigurationService } from './configuration.service.interface';

@Injectable()
export class NestConfigurationService implements IConfigurationService {
Expand Down
4 changes: 2 additions & 2 deletions src/datasources/cache/__tests__/fake.cache.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { faker } from '@faker-js/faker';
import { range } from 'lodash';
import { CacheDir } from '../entities/cache-dir.entity';
import { FakeCacheService } from './fake.cache.service';
import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';

describe('FakeCacheService', () => {
let target: FakeCacheService;
Expand Down
4 changes: 2 additions & 2 deletions src/datasources/cache/__tests__/fake.cache.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ICacheService } from '../cache.service.interface';
import { CacheDir } from '../entities/cache-dir.entity';
import { ICacheService } from '@/datasources/cache/cache.service.interface';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';

export class FakeCacheService implements ICacheService {
private cache: Record<string, Record<string, any>> = {};
Expand Down
4 changes: 2 additions & 2 deletions src/datasources/cache/__tests__/test.cache.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Global, Module } from '@nestjs/common';
import { CacheService } from '../cache.service.interface';
import { FakeCacheService } from './fake.cache.service';
import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service';
import { CacheReadiness } from '@/domain/interfaces/cache-readiness.interface';
import { CacheService } from '@/datasources/cache/cache.service.interface';

/**
* The {@link TestCacheModule} should be used whenever you want to
Expand Down
4 changes: 2 additions & 2 deletions src/datasources/cache/cache.first.data.source.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
import { CacheFirstDataSource } from './cache.first.data.source';
import { HttpErrorFactory } from '../errors/http-error-factory';
import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source';
import { HttpErrorFactory } from '@/datasources/errors/http-error-factory';

@Module({
providers: [CacheFirstDataSource, HttpErrorFactory],
Expand Down
14 changes: 7 additions & 7 deletions src/datasources/cache/cache.first.data.source.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { faker } from '@faker-js/faker';
import { ILoggingService } from '@/logging/logging.interface';
import { NetworkResponseError } from '../network/entities/network.error.entity';
import { CacheFirstDataSource } from './cache.first.data.source';
import { ICacheService } from './cache.service.interface';
import { CacheDir } from './entities/cache-dir.entity';
import { FakeCacheService } from './__tests__/fake.cache.service';
import { fakeJson } from '@/__tests__/faker';
import { INetworkService } from '../network/network.service.interface';
import { FakeCacheService } from '@/datasources/cache/__tests__/fake.cache.service';
import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source';
import { ICacheService } from '@/datasources/cache/cache.service.interface';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';
import { NetworkResponseError } from '@/datasources/network/entities/network.error.entity';
import { INetworkService } from '@/datasources/network/network.service.interface';
import { ILoggingService } from '@/logging/logging.interface';

const mockLoggingService = {
info: jest.fn(),
Expand Down
17 changes: 10 additions & 7 deletions src/datasources/cache/cache.first.data.source.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { NetworkRequest } from '../network/entities/network.request.entity';
import { CacheService, ICacheService } from './cache.service.interface';
import { Inject, Injectable } from '@nestjs/common';
import { get } from 'lodash';
import {
CacheService,
ICacheService,
} from '@/datasources/cache/cache.service.interface';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';
import { NetworkResponseError } from '@/datasources/network/entities/network.error.entity';
import { NetworkRequest } from '@/datasources/network/entities/network.request.entity';
import {
INetworkService,
NetworkService,
} from '../network/network.service.interface';
import { Inject, Injectable } from '@nestjs/common';
import { CacheDir } from './entities/cache-dir.entity';
import { NetworkResponseError } from '../network/entities/network.error.entity';
import { get } from 'lodash';
} from '@/datasources/network/network.service.interface';
import { ILoggingService, LoggingService } from '@/logging/logging.interface';

/**
Expand Down
6 changes: 3 additions & 3 deletions src/datasources/cache/cache.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Global, Module } from '@nestjs/common';
import { CacheService } from './cache.service.interface';
import { RedisCacheService } from './redis.cache.service';
import { createClient } from 'redis';
import { IConfigurationService } from '@/config/configuration.service.interface';
import { ILoggingService, LoggingService } from '@/logging/logging.interface';
import { CacheService } from '@/datasources/cache/cache.service.interface';
import { RedisCacheService } from '@/datasources/cache/redis.cache.service';
import { CacheReadiness } from '@/domain/interfaces/cache-readiness.interface';
import { ILoggingService, LoggingService } from '@/logging/logging.interface';

export type RedisClientType = ReturnType<typeof createClient>;

Expand Down
2 changes: 1 addition & 1 deletion src/datasources/cache/cache.router.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CacheDir } from './entities/cache-dir.entity';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';

export class CacheRouter {
private static readonly ALL_TRANSACTIONS_KEY = 'all_transactions';
Expand Down
2 changes: 1 addition & 1 deletion src/datasources/cache/cache.service.interface.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CacheDir } from './entities/cache-dir.entity';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';

export const CacheService = Symbol('ICacheService');

Expand Down
6 changes: 3 additions & 3 deletions src/datasources/cache/redis.cache.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { faker } from '@faker-js/faker';
import { ILoggingService } from '@/logging/logging.interface';
import { RedisClientType } from './cache.module';
import { CacheDir } from './entities/cache-dir.entity';
import { RedisCacheService } from './redis.cache.service';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';
import { RedisCacheService } from '@/datasources/cache/redis.cache.service';
import { RedisClientType } from 'redis';
import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service';
import clearAllMocks = jest.clearAllMocks;
import { fakeJson } from '@/__tests__/faker';
Expand Down
8 changes: 4 additions & 4 deletions src/datasources/cache/redis.cache.service.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Inject, Injectable, OnModuleDestroy } from '@nestjs/common';
import { IConfigurationService } from '@/config/configuration.service.interface';
import { ILoggingService, LoggingService } from '@/logging/logging.interface';
import { RedisClientType } from './cache.module';
import { ICacheService } from './cache.service.interface';
import { CacheDir } from './entities/cache-dir.entity';
import { RedisClientType } from '@/datasources/cache/cache.module';
import { ICacheService } from '@/datasources/cache/cache.service.interface';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';
import { ICacheReadiness } from '@/domain/interfaces/cache-readiness.interface';
import { ILoggingService, LoggingService } from '@/logging/logging.interface';

@Injectable()
export class RedisCacheService
Expand Down
6 changes: 3 additions & 3 deletions src/datasources/config-api/config-api.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Global, Module } from '@nestjs/common';
import { ConfigApi } from './config-api.service';
import { CacheFirstDataSourceModule } from '../cache/cache.first.data.source.module';
import { IConfigApi } from '@/domain/interfaces/config-api.interface';
import { HttpErrorFactory } from '../errors/http-error-factory';
import { ConfigApi } from '@/datasources/config-api/config-api.service';
import { CacheFirstDataSourceModule } from '@/datasources/cache/cache.first.data.source.module';
import { HttpErrorFactory } from '@/datasources/errors/http-error-factory';

@Global()
@Module({
Expand Down
14 changes: 7 additions & 7 deletions src/datasources/config-api/config-api.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ConfigApi } from './config-api.service';
import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service';
import { CacheFirstDataSource } from '../cache/cache.first.data.source';
import { HttpErrorFactory } from '../errors/http-error-factory';
import { DataSourceError } from '@/domain/errors/data-source.error';
import { faker } from '@faker-js/faker';
import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source';
import { ICacheService } from '@/datasources/cache/cache.service.interface';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';
import { ConfigApi } from '@/datasources/config-api/config-api.service';
import { HttpErrorFactory } from '@/datasources/errors/http-error-factory';
import { chainBuilder } from '@/domain/chains/entities/__tests__/chain.builder';
import { DataSourceError } from '@/domain/errors/data-source.error';
import { safeAppBuilder } from '@/domain/safe-apps/entities/__tests__/safe-app.builder';
import { CacheDir } from '../cache/entities/cache-dir.entity';
import { ICacheService } from '../cache/cache.service.interface';
import { faker } from '@faker-js/faker';

const dataSource = {
get: jest.fn(),
Expand Down
11 changes: 7 additions & 4 deletions src/datasources/config-api/config-api.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { Inject, Injectable } from '@nestjs/common';
import { IConfigurationService } from '@/config/configuration.service.interface';
import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source';
import { CacheRouter } from '@/datasources/cache/cache.router';
import {
CacheService,
ICacheService,
} from '@/datasources/cache/cache.service.interface';
import { HttpErrorFactory } from '@/datasources/errors/http-error-factory';
import { Chain } from '@/domain/chains/entities/chain.entity';
import { Page } from '@/domain/entities/page.entity';
import { IConfigApi } from '@/domain/interfaces/config-api.interface';
import { SafeApp } from '@/domain/safe-apps/entities/safe-app.entity';
import { CacheFirstDataSource } from '../cache/cache.first.data.source';
import { CacheRouter } from '../cache/cache.router';
import { HttpErrorFactory } from '../errors/http-error-factory';
import { CacheService, ICacheService } from '../cache/cache.service.interface';

@Injectable()
export class ConfigApi implements IConfigApi {
Expand Down
6 changes: 3 additions & 3 deletions src/datasources/errors/http-error-factory.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { faker } from '@faker-js/faker';
import { HttpErrorFactory } from './http-error-factory';
import { HttpErrorFactory } from '@/datasources/errors/http-error-factory';
import {
NetworkOtherError,
NetworkRequestError,
NetworkResponseError,
} from '../network/entities/network.error.entity';
} from '@/datasources/network/entities/network.error.entity';
import { faker } from '@faker-js/faker';

describe('HttpErrorFactory', () => {
const httpErrorFactory: HttpErrorFactory = new HttpErrorFactory();
Expand Down
4 changes: 2 additions & 2 deletions src/datasources/errors/http-error-factory.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { HttpStatus, Injectable } from '@nestjs/common';
import { DataSourceError } from '@/domain/errors/data-source.error';
import {
NetworkError,
NetworkResponseError,
} from '../network/entities/network.error.entity';
} from '@/datasources/network/entities/network.error.entity';
import { DataSourceError } from '@/domain/errors/data-source.error';

/**
* Maps a {@link NetworkError} or {@link Error} into a {@link DataSourceError}
Expand Down
6 changes: 3 additions & 3 deletions src/datasources/exchange-api/exchange-api.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Global, Module } from '@nestjs/common';
import { HttpErrorFactory } from '../errors/http-error-factory';
import { ExchangeApi } from './exchange-api.service';
import { CacheFirstDataSourceModule } from '@/datasources/cache/cache.first.data.source.module';
import { HttpErrorFactory } from '@/datasources/errors/http-error-factory';
import { ExchangeApi } from '@/datasources/exchange-api/exchange-api.service';
import { IExchangeApi } from '@/domain/interfaces/exchange-api.interface';
import { CacheFirstDataSourceModule } from '../cache/cache.first.data.source.module';

@Global()
@Module({
Expand Down
8 changes: 4 additions & 4 deletions src/datasources/exchange-api/exchange-api.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ExchangeApi } from './exchange-api.service';
import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service';
import { faker } from '@faker-js/faker';
import { FakeConfigurationService } from '@/config/__tests__/fake.configuration.service';
import { CacheFirstDataSource } from '@/datasources/cache/cache.first.data.source';
import { CacheDir } from '@/datasources/cache/entities/cache-dir.entity';
import { ExchangeApi } from '@/datasources/exchange-api/exchange-api.service';
import { exchangeFiatCodesBuilder } from '@/domain/exchange/entities/__tests__/exchange-fiat-codes.builder';
import { exchangeRatesBuilder } from '@/domain/exchange/entities/__tests__/exchange-rates.builder';
import { CacheFirstDataSource } from '../cache/cache.first.data.source';
import { CacheDir } from '../cache/entities/cache-dir.entity';

const mockCacheFirstDataSource = jest.mocked({
get: jest.fn(),
Expand Down
Loading

0 comments on commit 4729440

Please sign in to comment.