Skip to content

Commit 08e3bb5

Browse files
committed
refactor(nestjs-json-rpc-sdk,json-api-nestjs-sdk): Remove Angular module
remove build Angular module BREAKING CHANGE: now do not export Angular module
1 parent 519e3c0 commit 08e3bb5

File tree

11 files changed

+34
-122
lines changed

11 files changed

+34
-122
lines changed

libs/json-api/json-api-nestjs-sdk/README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const [addressPost, managerPost, rolesPost, userPost] = await jsonSdk
9393
```
9494
or you can use Angular module:
9595
```typescript
96-
import { JsonApiAngular, AtomicFactory, JsonApiSdkService } from 'json-api-nestjs-sdk/ngModule';
96+
import { provideJsonApi, AtomicFactory, JsonApiSdkService } from 'json-api-nestjs-sdk/ngModule';
97+
import {
98+
provideHttpClient,
99+
withFetch,
100+
} from '@angular/common/http';
97101

98102
@Component({
99103
standalone: true,
@@ -115,9 +119,8 @@ const angularConfig: JsonSdkConfig = {
115119

116120
bootstrapApplication(AppComponent, {
117121
providers: [
118-
importProvidersFrom(
119-
JsonApiAngular.forRoot(angularConfig)
120-
),
122+
provideHttpClient(withFetch()),
123+
provideJsonApi(angularConfig)
121124
],
122125
}).catch((err) =>
123126
console.error(err)

libs/json-api/json-api-nestjs-sdk/package.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"engines": {
55
"node": ">= 16.0.0"
66
},
7-
"description": "JsonAPi Plugin for NestJs",
7+
"description": "Helper for client JsonAPi Plugin for NestJs",
88
"contributors": [
99
{
1010
"email": "[email protected]",
@@ -28,5 +28,12 @@
2828
"json-api",
2929
"typeorm",
3030
"CRUD"
31-
]
31+
],
32+
"peerDependencies": {
33+
"@angular/common": ">=19.0.0 <20.0.0",
34+
"@angular/core": ">=19.0.0 <20.0.0",
35+
"axios": "^1.6.0",
36+
"reflect-metadata": "^0.1.13",
37+
"tslib": "^2.3.0"
38+
}
3239
}

libs/json-api/json-api-nestjs-sdk/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk",
3030
"commands": [
3131
"node tools/scripts/preparation-hybrid-npm-package.mjs json-api-nestjs-sdk",
32-
"node tools/scripts/preparation-npm-package.mjs json-api-nestjs-sdk",
33-
"node tools/scripts/prepare-for-angular.mjs json-api-nestjs-sdk json-api-angular"
32+
"node tools/scripts/preparation-npm-package.mjs json-api-nestjs-sdk"
3433
],
3534
"cwd": "./",
3635
"parallel": false

libs/json-api/json-api-nestjs-sdk/src/lib/json-api-angular.ts

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
import {
2-
NgModule,
3-
ModuleWithProviders,
4-
inject,
5-
makeEnvironmentProviders,
6-
} from '@angular/core';
7-
import {
8-
HttpClient,
9-
provideHttpClient,
10-
withInterceptorsFromDi,
11-
} from '@angular/common/http';
1+
import { inject, makeEnvironmentProviders } from '@angular/core';
2+
import { HttpClient } from '@angular/common/http';
123
import { HttpInnerClient, JsonSdkConfig } from './types';
134
import { AtomicFactory, JSON_API_SDK_CONFIG } from './token';
145
import { resultConfig } from './utils';
@@ -57,17 +48,4 @@ export const getProviders = (config: JsonSdkConfig) => [
5748
export const provideJsonApi = (config: JsonSdkConfig) =>
5849
makeEnvironmentProviders(getProviders(config));
5950

60-
@NgModule({
61-
imports: [],
62-
providers: [provideHttpClient(withInterceptorsFromDi())],
63-
})
64-
export class JsonApiAngular {
65-
static forRoot(config: JsonSdkConfig): ModuleWithProviders<JsonApiAngular> {
66-
return {
67-
ngModule: JsonApiAngular,
68-
providers: getProviders(config),
69-
};
70-
}
71-
}
72-
7351
export { AtomicFactory, JSON_API_SDK_CONFIG } from './token';

libs/json-api/json-api-nestjs-sdk/src/ngModule.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export {
2-
JsonApiAngular,
32
AtomicFactory,
43
provideJsonApi,
54
JSON_API_SDK_CONFIG,

libs/json-api/json-api-nestjs/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,9 @@
2828
"json-api",
2929
"typeorm",
3030
"CRUD"
31-
]
31+
],
32+
"peerDependencies": {
33+
"reflect-metadata": "^0.1.13",
34+
"tslib": "^2.3.0"
35+
}
3236
}

libs/json-rpc/nestjs-json-rpc-sdk/README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,14 @@ You can use Angular module:
214214
```typescript
215215

216216
import {
217-
JsonRpcAngular,
217+
provideJsonRpc,
218218
JsonRpcAngularConfig,
219219
TransportType,
220220
} from '@klerick/nestjs-json-rpc-sdk/ngModule'
221+
import {
222+
provideHttpClient,
223+
withFetch,
224+
} from '@angular/common/http';
221225
import { Subject } from 'rxjs';
222226
import { io } from 'socket.io-client';
223227
import {
@@ -275,9 +279,8 @@ const ioConfig: JsonRpcAngularConfig = {
275279

276280
bootstrapApplication(AppComponent, {
277281
providers: [
278-
importProvidersFrom(
279-
JsonRpcAngular.forRoot(httpConfig)
280-
),
282+
provideHttpClient(withFetch()),
283+
provideJsonRpc(httpConfig),
281284
],
282285
}).catch((err) =>
283286
console.error(err)

libs/json-rpc/nestjs-json-rpc-sdk/project.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,7 @@
2929
"outputPath": "dist/libs/json-rpc/nestjs-json-rpc-sdk",
3030
"commands": [
3131
"node tools/scripts/preparation-hybrid-npm-package.mjs nestjs-json-rpc-sdk",
32-
"node tools/scripts/preparation-npm-package.mjs nestjs-json-rpc-sdk",
33-
{
34-
"command": "nx run nestjs-json-rpc-sdk:compile-for-angular",
35-
"forwardAllArgs": false
36-
},
37-
{
38-
"command": "cp tmp/angular-lib/nestjs-json-rpc-sdk/esm2022/lib/angular/json-rpc-angular.module.mjs dist/libs/json-rpc/nestjs-json-rpc-sdk/mjs/src/lib/angular/json-rpc-angular.module.js",
39-
"forwardAllArgs": false
40-
}
32+
"node tools/scripts/preparation-npm-package.mjs nestjs-json-rpc-sdk"
4133
],
4234
"cwd": "./",
4335
"parallel": false
Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
import {
2-
makeEnvironmentProviders,
3-
ModuleWithProviders,
4-
NgModule,
5-
} from '@angular/core';
6-
import {
7-
provideHttpClient,
8-
withInterceptorsFromDi,
9-
} from '@angular/common/http';
1+
import { makeEnvironmentProviders } from '@angular/core';
102

113
import { JSON_RPC_SDK_CONFIG } from './tokens';
124
import { JsonRpcAngularConfig } from '../types';
@@ -18,23 +10,3 @@ export const provideJsonRpc = (config: JsonRpcAngularConfig) =>
1810
provide: JSON_RPC_SDK_CONFIG,
1911
},
2012
]);
21-
22-
@NgModule({
23-
imports: [],
24-
providers: [provideHttpClient(withInterceptorsFromDi())],
25-
})
26-
export class JsonRpcAngular {
27-
static forRoot(
28-
config: JsonRpcAngularConfig
29-
): ModuleWithProviders<JsonRpcAngular> {
30-
return {
31-
ngModule: JsonRpcAngular,
32-
providers: [
33-
{
34-
useValue: config,
35-
provide: JSON_RPC_SDK_CONFIG,
36-
},
37-
],
38-
};
39-
}
40-
}
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
export {
2-
JsonRpcAngular,
3-
provideJsonRpc,
4-
} from './angular/json-rpc-angular.module';
1+
export { provideJsonRpc } from './angular/json-rpc-angular.module';
52
export { JsonRpcAngularConfig, TransportType, Rpc } from './types';
63
export { JSON_RPC, RPC_BATCH } from './angular/tokens';

0 commit comments

Comments
 (0)