chore: address todos, remove deprecated

This commit is contained in:
Kamil Myśliwiec
2024-12-12 10:07:06 +01:00
parent 5d3c284b86
commit 18b1bcec29
5 changed files with 23 additions and 37 deletions

View File

@@ -278,12 +278,15 @@ export class NestContainer {
return moduleRef.addInjectable(injectable, enhancerSubtype, host);
}
public addExportedProvider(provider: Type<any>, token: string) {
public addExportedProviderOrModule(
toExport: Type<any> | DynamicModule,
token: string,
) {
if (!this.modules.has(token)) {
throw new UnknownModuleException();
}
const moduleRef = this.modules.get(token)!;
moduleRef.addExportedProvider(provider);
moduleRef.addExportedProviderOrModule(toExport);
}
public addController(controller: Type<any>, token: string) {

View File

@@ -447,21 +447,21 @@ export class Module {
);
}
public addExportedProvider(
provider: Provider | string | symbol | DynamicModule,
public addExportedProviderOrModule(
toExport: Provider | string | symbol | DynamicModule,
) {
const addExportedUnit = (token: InjectionToken) =>
this._exports.add(this.validateExportedProvider(token));
if (this.isCustomProvider(provider as any)) {
return this.addCustomExportedProvider(provider as any);
} else if (isString(provider) || isSymbol(provider)) {
return addExportedUnit(provider);
} else if (this.isDynamicModule(provider)) {
const { module: moduleClassRef } = provider;
if (this.isCustomProvider(toExport as any)) {
return this.addCustomExportedProvider(toExport as any);
} else if (isString(toExport) || isSymbol(toExport)) {
return addExportedUnit(toExport);
} else if (this.isDynamicModule(toExport)) {
const { module: moduleClassRef } = toExport;
return addExportedUnit(moduleClassRef);
}
addExportedUnit(provider as Type<any>);
addExportedUnit(toExport as Type<any>);
}
public addCustomExportedProvider(
@@ -527,13 +527,6 @@ export class Module {
this._imports.add(moduleRef);
}
/**
* @deprecated
*/
public addRelatedModule(module: Module) {
this._imports.add(module);
}
public replace(toReplace: InjectionToken, options: any) {
if (options.isProvider && this.hasProvider(toReplace)) {
const originalProvider = this._providers.get(toReplace);

View File

@@ -274,7 +274,7 @@ export class DependenciesScanner {
)!,
];
exports.forEach(exportedProvider =>
this.insertExportedProvider(exportedProvider, token),
this.insertExportedProviderOrModule(exportedProvider, token),
);
}
@@ -532,15 +532,14 @@ export class DependenciesScanner {
}
}
public insertExportedProvider(
// TODO: improve the type definition below because it doesn't reflects the real usage of this method
exportedProvider: Type<Injectable> | ForwardReference,
public insertExportedProviderOrModule(
toExport: ForwardReference | DynamicModule | Type<unknown>,
token: string,
) {
const fulfilledProvider = this.isForwardReference(exportedProvider)
? exportedProvider.forwardRef()
: exportedProvider;
this.container.addExportedProvider(fulfilledProvider, token);
const fulfilledProvider = this.isForwardReference(toExport)
? toExport.forwardRef()
: toExport;
this.container.addExportedProviderOrModule(fulfilledProvider, token);
}
public insertController(controller: Type<Controller>, token: string) {

View File

@@ -1035,13 +1035,6 @@ export type ConsumerRunConfig = {
eachMessage?: EachMessageHandler;
};
/**
* @deprecated Replaced by ConsumerSubscribeTopics
*/
export type ConsumerSubscribeTopic = {
topic: string | RegExp;
fromBeginning?: boolean;
};
export type ConsumerSubscribeTopics = {
topics: (string | RegExp)[];
fromBeginning?: boolean;
@@ -1050,9 +1043,7 @@ export type ConsumerSubscribeTopics = {
export type Consumer = {
connect(): Promise<void>;
disconnect(): Promise<void>;
subscribe(
subscription: ConsumerSubscribeTopics | ConsumerSubscribeTopic,
): Promise<void>;
subscribe(subscription: ConsumerSubscribeTopics): Promise<void>;
stop(): Promise<void>;
run(config?: ConsumerRunConfig): Promise<void>;
commitOffsets(

View File

@@ -72,7 +72,7 @@ export class TestingInjector extends Injector {
},
internalCoreModule.providers,
);
internalCoreModule.addExportedProvider(name);
internalCoreModule.addExportedProviderOrModule(name);
return newWrapper;
} else {
throw err;