Skip to content

Commit

Permalink
fix(*): resolve circular dependency in DI (#557)
Browse files Browse the repository at this point in the history
having this file in the `Config` folder causing errors:

```
bright-cli % node -r ts-node/register/transpile-only -r tsconfig-paths/register src/index.ts scan:run --token abc --name abc
[2024-07-01T16:45:24.503Z] [ERROR  ] - Error during "scan:run": TypeInfo not known for "undefined"
```
  • Loading branch information
maksadbek authored Jul 4, 2024
1 parent a7a288f commit 08c9cd0
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/Commands/Configure.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { logger } from '../Utils';
import { ConnectivityUrls, Platform, TestType, Options } from '../Wizard';
import { container } from '../Config';
import container from '../container';
import { Arguments, Argv, CommandModule } from 'yargs';

export class Configure implements CommandModule {
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/RunRepeater.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Cert, RequestExecutorOptions } from '../RequestExecutor';
import { Helpers, logger } from '../Utils';
import { container } from '../Config';
import container from '../container';
import { DefaultRepeaterServerOptions, RepeaterLauncher } from '../Repeater';
import { Arguments, Argv, CommandModule } from 'yargs';
import { captureException } from '@sentry/node';
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/UploadArchive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SpecType
} from '../Archive';
import { Helpers, logger } from '../Utils';
import { container } from '../Config';
import container from '../container';
import { Arguments, Argv, CommandModule } from 'yargs';

export class UploadArchive implements CommandModule {
Expand Down
1 change: 0 additions & 1 deletion src/Config/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export { default as container } from './container';
export * from './CliBuilder';
export * from './ConfigReader';
export * from './CliInfo';
1 change: 1 addition & 0 deletions src/Scan/RestScans.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'reflect-metadata';
import { CliInfo } from '../Config';
import {
Discovery,
Expand Down
26 changes: 13 additions & 13 deletions src/Config/container.ts → src/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import {
HttpRequestExecutor,
RequestExecutor,
WsRequestExecutor
} from '../RequestExecutor';
} from './RequestExecutor';
import {
DefaultVirtualScripts,
FSScriptLoader,
ScriptLoader,
VirtualScripts
} from '../Scripts';
import { DefaultStartupManager, StartupManager } from '../StartupScripts';
} from './Scripts';
import { DefaultStartupManager, StartupManager } from './StartupScripts';
import {
AuthConnectivity,
Connectivity,
Expand All @@ -25,26 +25,26 @@ import {
TCPConnectivity,
TracerouteConnectivity,
Tokens
} from '../Wizard';
} from './Wizard';
import {
BreakpointFactory,
DefaultBreakpointFactory,
DefaultPollingFactory,
PollingFactory,
RestScans,
Scans
} from '../Scan';
import { EntryPoints, RestEntryPoints } from '../EntryPoint';
} from './Scan';
import { EntryPoints, RestEntryPoints } from './EntryPoint';
import {
Archives,
DefaultParserFactory,
ParserFactory,
RestArchives
} from '../Archive';
import { ConfigReader } from './ConfigReader';
import { DefaultConfigReader } from './DefaultConfigReader';
import { CliInfo } from './CliInfo';
import { CliBuilder } from './CliBuilder';
} from './Archive';
import { ConfigReader } from './Config/ConfigReader';
import { DefaultConfigReader } from './Config/DefaultConfigReader';
import { CliInfo } from './Config/CliInfo';
import { CliBuilder } from './Config/CliBuilder';
import {
RepeaterServer,
DefaultRepeaterServer,
Expand All @@ -54,8 +54,8 @@ import {
DefaultRuntimeDetector,
RepeaterLauncher,
ServerRepeaterLauncher
} from '../Repeater';
import { ProxyFactory, DefaultProxyFactory } from '../Utils';
} from './Repeater';
import { ProxyFactory, DefaultProxyFactory } from './Utils';
import { container, Lifecycle } from 'tsyringe';

container
Expand Down
3 changes: 2 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import {
Configure,
GetEntryPoints
} from './Commands';
import { CliBuilder, container } from './Config';
import { CliBuilder } from './Config';
import container from './container';

container.resolve(CliBuilder).build({
commands: [
Expand Down

0 comments on commit 08c9cd0

Please sign in to comment.