Skip to content

Commit 9c00fdb

Browse files
oscar-guerinoscar-guerin
committed
fix: rework module imports
1 parent 66c088e commit 9c00fdb

File tree

12 files changed

+35
-35
lines changed

12 files changed

+35
-35
lines changed

‎projects/ngx-firestore-repository/src/e2e/util/repository-intializer.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable, Type } from '@angular/core';
2-
import { InjectRepository, provideNgxRepositoryModule } from '@paddls/ngx-repository';
2+
import { InjectRepository, provideNgxRepository } from '@paddls/ngx-repository';
33
import { TestBed } from '@angular/core/testing';
44
import { Firestore, getFirestore } from 'firebase/firestore';
55
import { initializeApp } from 'firebase/app';
@@ -36,7 +36,7 @@ export function initializeRepository<T>(bookImpl: Type<T>, providers: any[] = []
3636

3737
TestBed.configureTestingModule({
3838
providers: [
39-
provideNgxRepositoryModule(),
39+
provideNgxRepository(),
4040
provideNgxFirestoreRepository(),
4141
BookServiceImpl,
4242
{

‎projects/ngx-firestore-repository/src/lib/ngx-firestore-repository.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'reflect-metadata';
22

3-
import { EnvironmentProviders, makeEnvironmentProviders, ModuleWithProviders, NgModule, Provider } from '@angular/core';
3+
import { ModuleWithProviders, NgModule, Provider } from '@angular/core';
44
import { FirestoreRepositoryBuilder } from './repository/firestore-repository-builder.service';
55
import { FIRESTORE_APP } from './ngx-firestore-repository.module.di';
66
import { REPOSITORY_BUILDER_TOKEN } from '@paddls/ngx-repository';
@@ -34,7 +34,7 @@ export interface NgxFirestoreRepositoryModuleConfiguration { // @TODO: RMA/TNI :
3434
debug?: boolean;
3535
}
3636

37-
export function provideNgxFirestoreRepository(config: NgxFirestoreRepositoryModuleConfiguration = {debug: false}): EnvironmentProviders {
37+
export function provideNgxFirestoreRepository(config: NgxFirestoreRepositoryModuleConfiguration = {debug: false}): Provider[] {
3838
const providers: Provider[] = [
3939
...MODULE_PROVIDERS,
4040
{
@@ -47,7 +47,7 @@ export function provideNgxFirestoreRepository(config: NgxFirestoreRepositoryModu
4747
providers.push(LogExecuteFirestoreRequestEventListener);
4848
}
4949

50-
return makeEnvironmentProviders(providers);
50+
return providers;
5151
}
5252

5353
/**

‎projects/ngx-http-repository/src/e2e/http-request.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {
77
PageResponseProcessor,
88
PathColumn,
99
PathParam,
10-
provideNgxRepositoryModule
10+
provideNgxRepository
1111
} from '@paddls/ngx-repository';
12-
import { provideNgxHttpRepositoryModule } from '../lib/ngx-http-repository.module';
12+
import { provideNgxHttpRepository } from '../lib/ngx-http-repository.module';
1313
import { Injectable } from '@angular/core';
1414
import { HttpClient } from '@angular/common/http';
1515
import { expectHttpRequest, HttpRequestTestContext } from './util/expect-http-request.spec';
@@ -194,8 +194,8 @@ describe('HttpRequestDecorator', () => {
194194
beforeEach(() => {
195195
TestBed.configureTestingModule({
196196
providers: [
197-
provideNgxRepositoryModule(),
198-
provideNgxHttpRepositoryModule(),
197+
provideNgxRepository(),
198+
provideNgxHttpRepository(),
199199
Api
200200
]
201201
});

‎projects/ngx-http-repository/src/e2e/live-resource.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { TestBed } from '@angular/core/testing';
2-
import { Column, Id, InjectRepository, Page, provideNgxRepositoryModule } from '@paddls/ngx-repository';
2+
import { Column, Id, InjectRepository, Page, provideNgxRepository } from '@paddls/ngx-repository';
33
import { HttpLiveResource, HttpRepository, HttpResource } from '../public-api';
44
import { Injectable } from '@angular/core';
55
import { HttpClient } from '@angular/common/http';
66
import { of } from 'rxjs';
77
import { take, toArray } from 'rxjs/operators';
8-
import { provideNgxHttpRepositoryModule } from '../lib/ngx-http-repository.module';
8+
import { provideNgxHttpRepository } from '../lib/ngx-http-repository.module';
99

1010
describe('LiveResource', () => {
1111

@@ -40,8 +40,8 @@ describe('LiveResource', () => {
4040
beforeEach(() => {
4141
TestBed.configureTestingModule({
4242
providers: [
43-
provideNgxRepositoryModule(),
44-
provideNgxHttpRepositoryModule(),
43+
provideNgxRepository(),
44+
provideNgxHttpRepository(),
4545
BookService
4646
]
4747
});

‎projects/ngx-http-repository/src/e2e/util/repository-intializer.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { HttpClient } from '@angular/common/http';
22
import { Injectable, Type } from '@angular/core';
3-
import { InjectRepository, provideNgxRepositoryModule } from '@paddls/ngx-repository';
3+
import { InjectRepository, provideNgxRepository } from '@paddls/ngx-repository';
44
import { HttpRepository } from '../../lib/repository/http.repository';
55
import { TestBed } from '@angular/core/testing';
6-
import { provideNgxHttpRepositoryModule } from '../../lib/ngx-http-repository.module';
6+
import { provideNgxHttpRepository } from '../../lib/ngx-http-repository.module';
77

88
export interface RepositoryContext<T> {
99
repository: HttpRepository<T, number>;
@@ -21,8 +21,8 @@ export function initializeRepository<T>(bookImpl: Type<T>, providers: any[] = []
2121

2222
TestBed.configureTestingModule({
2323
providers: [
24-
provideNgxRepositoryModule(),
25-
provideNgxHttpRepositoryModule(),
24+
provideNgxRepository(),
25+
provideNgxHttpRepository(),
2626
BookServiceImpl,
2727
...providers
2828
]

‎projects/ngx-http-repository/src/e2e/util/test-http-repository.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Injectable, Type } from '@angular/core';
2-
import { InjectRepository, provideNgxRepositoryModule } from '@paddls/ngx-repository';
2+
import { InjectRepository, provideNgxRepository } from '@paddls/ngx-repository';
33
import { TestBed } from '@angular/core/testing';
44
import { HttpClient, HttpParams } from '@angular/common/http';
55
import { HttpRepository } from '../../lib/repository/http.repository';
66
import { NgxHttpRepositoryModuleConfiguration } from '../../public-api';
77
import { expectHttpRequest, HttpRequestTestContext } from './expect-http-request.spec';
8-
import { provideNgxHttpRepositoryModule } from '../../lib/ngx-http-repository.module';
8+
import { provideNgxHttpRepository } from '../../lib/ngx-http-repository.module';
99
import { forOwn } from '../../lib/utils/for-own';
1010

1111
export interface HttpTestContext extends HttpRequestTestContext {
@@ -58,8 +58,8 @@ export async function httpTest(httpTestContext: HttpTestContext): Promise<void>
5858

5959
TestBed.configureTestingModule({
6060
providers: [
61-
provideNgxRepositoryModule(),
62-
provideNgxHttpRepositoryModule(httpTestContext.httpConfiguration || {debug: false}),
61+
provideNgxRepository(),
62+
provideNgxHttpRepository(httpTestContext.httpConfiguration || {debug: false}),
6363
...(httpTestContext.providers || []),
6464
...providers
6565
]

‎projects/ngx-http-repository/src/lib/ngx-http-repository.module.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
22
import {
33
NgxHttpRepositoryModule,
44
NgxHttpRepositoryModuleConfiguration,
5-
provideNgxHttpRepositoryModule
5+
provideNgxHttpRepository
66
} from './ngx-http-repository.module';
77
import { LogExecuteHttpRequestEventListener } from './driver/listener/log-execute-http-request-event.listener';
88
import { HTTP_REPOSITORY_CONFIGURATION } from './configuration/http-repository.configuration';
@@ -21,15 +21,15 @@ describe('NgxHttpRepositoryModule.forRoot', () => {
2121
testHttpRepository();
2222
});
2323

24-
describe('provideNgxHttpRepositoryModule', () => {
24+
describe('provideNgxHttpRepository', () => {
2525
const config: NgxHttpRepositoryModuleConfiguration = {
2626
debug: true
2727
};
2828

2929
beforeEach(() => {
3030
TestBed.configureTestingModule({
3131
providers: [
32-
provideNgxHttpRepositoryModule(config)
32+
provideNgxHttpRepository(config)
3333
]
3434
});
3535
});

‎projects/ngx-http-repository/src/lib/ngx-http-repository.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ export interface NgxHttpRepositoryModuleConfiguration {
2929
debug?: boolean;
3030
}
3131

32-
export function provideNgxHttpRepositoryModule(config: NgxHttpRepositoryModuleConfiguration = {debug: false}): EnvironmentProviders | Provider[] {
33-
const providers: Provider | EnvironmentProviders[] = [
32+
export function provideNgxHttpRepository(config: NgxHttpRepositoryModuleConfiguration = {debug: false}): Provider[] {
33+
const providers: Provider = [
3434
...PROVIDERS,
3535
{
3636
provide: HTTP_REPOSITORY_CONFIGURATION,
@@ -56,7 +56,7 @@ export function provideNgxHttpRepositoryModule(config: NgxHttpRepositoryModuleCo
5656
export class NgxHttpRepositoryModule {
5757

5858
/**
59-
* @deprecated The method should not be used, use provideNgxHttpRepositoryModule
59+
* @deprecated The method should not be used, use provideNgxHttpRepository
6060
*/
6161
public static forRoot(config: NgxHttpRepositoryModuleConfiguration = {debug: false}): ModuleWithProviders<NgxHttpRepositoryModule> {
6262
const providers: Provider[] = [

‎projects/ngx-http-repository/src/public-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export { HttpWriteOperation, HTTP_WRITE_OPERATIONS } from './lib/request/http.op
3636

3737
export { HttpRepositoryResponse } from './lib/response/http-repository.response';
3838
export {
39-
provideNgxHttpRepositoryModule, NgxHttpRepositoryModule, NgxHttpRepositoryModuleConfiguration
39+
provideNgxHttpRepository, NgxHttpRepositoryModule, NgxHttpRepositoryModuleConfiguration
4040
} from './lib/ngx-http-repository.module';
4141
export {
4242
HttpRepositoryConfiguration, HTTP_REPOSITORY_CONFIGURATION

‎projects/ngx-repository-app/src/app/app.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import { InMemoryDataService } from './service/in-memory-data.service';
99
import { SystemModule } from './module/@system/system.module';
1010
import { LibrariesComponent } from './component/libraries/libraries.component';
1111
import { LibraryComponent } from './component/library/library.component';
12-
import { provideNgxRepositoryModule } from '@paddls/ngx-repository';
12+
import { provideNgxRepository } from '@paddls/ngx-repository';
1313
import { MyPageResponseProcessor } from './module/@core/processor/my-page-response.processor';
1414
import { ClientComponent } from './component/client/client.component';
1515
import { FIRESTORE_APP, provideNgxFirestoreRepository } from '@paddls/ngx-firestore-repository';
1616
import { initializeApp } from 'firebase/app';
1717
import { BookService } from './module/@core/service/book.service';
1818
import { Firestore, getFirestore } from 'firebase/firestore';
1919
import { PersonComponent } from './component/person/person.component';
20-
import { provideNgxHttpRepositoryModule } from '@paddls/ngx-http-repository';
20+
import { provideNgxHttpRepository } from '@paddls/ngx-http-repository';
2121

2222
export const createFirestore: () => Firestore = () => getFirestore(initializeApp({
2323
apiKey: 'AIzaSyDSd6EXdQWaWcBMxbTYp-kFAV3zxNu-ArM',
@@ -46,7 +46,7 @@ export const createFirestore: () => Firestore = () => getFirestore(initializeApp
4646
SystemModule,
4747
],
4848
providers: [
49-
provideNgxRepositoryModule({
49+
provideNgxRepository({
5050
normalizerConfiguration: {
5151
denormalizeNull: true,
5252
normalizeNull: false,
@@ -57,7 +57,7 @@ export const createFirestore: () => Firestore = () => getFirestore(initializeApp
5757
provideNgxFirestoreRepository({
5858
debug: true
5959
}),
60-
provideNgxHttpRepositoryModule({
60+
provideNgxHttpRepository({
6161
debug: true
6262
}),
6363
MyPageResponseProcessor,

‎projects/ngx-repository/src/lib/ngx-repository.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const MODULE_PROVIDERS: Provider[] = [
6565
*/
6666
export const NGX_REPOSITORY_INJECTOR_INSTANCE: string = 'NGX_REPOSITORY_INJECTOR_INSTANCE';
6767

68-
export function provideNgxRepositoryModule(config?: Config): Provider[] {
68+
export function provideNgxRepository(config?: Config): Provider[] {
6969
return [
7070
...MODULE_PROVIDERS,
7171
{
@@ -88,7 +88,7 @@ export function provideNgxRepositoryModule(config?: Config): Provider[] {
8888
export class NgxRepositoryModule {
8989

9090
/**
91-
* @deprecated The method should not be used, use provideNgxRepositoryModule instead
91+
* @deprecated The method should not be used, use provideNgxRepository instead
9292
*/
9393
public static forRoot(config?: Config): ModuleWithProviders<NgxRepositoryModule> {
9494
return {

‎projects/ngx-repository/src/public-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export { TokenRegistry } from './lib/core/registry/token.registry';
3636
export { REPOSITORY_BUILDER_TOKEN } from './lib/ngx-repository.module.di';
3737

3838
export {
39-
provideNgxRepositoryModule, NgxRepositoryModule, NGX_REPOSITORY_INJECTOR_INSTANCE
39+
provideNgxRepository, NgxRepositoryModule, NGX_REPOSITORY_INJECTOR_INSTANCE
4040
} from './lib/ngx-repository.module';
4141

4242
export {

0 commit comments

Comments
 (0)