Skip to content

Commit 7953371

Browse files
klerickklerick
committed
feat(json-api-nestjs-sdk,nestjs-json-rpc-sdk): Change export
Rename module for Angular Add additional exports
1 parent 28d3efc commit 7953371

File tree

13 files changed

+115
-57
lines changed

13 files changed

+115
-57
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ const [addressPost, managerPost, rolesPost, userPost] = await jsonSdk
9393
```
9494
or you can use Angular module:
9595
```typescript
96-
import { JsonApiAngular, AtomicFactory } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module';
97-
import { JsonApiSdkService } from 'json-api-nestjs-sdk';
96+
import { JsonApiAngular, AtomicFactory, JsonApiSdkService } from 'json-api-nestjs-sdk/ngModule';
9897

9998
@Component({
10099
standalone: true,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
3-
"dest": "../../../tmp/angular-lib/json-api-nestjs-sdk",
3+
"dest": "../../../tmp/angular-lib/ngModule",
44
"lib": {
55
"entryFile": "../../index.ts"
66
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"updateBuildableProjectDepsInPackageJson": true,
5252
"buildableProjectDepsInPackageJsonType": "peerDependencies",
5353
"additionalEntryPoints": [
54-
"libs/json-api/json-api-nestjs-sdk/src/json-api-nestjs-sdk.module.ts"
54+
"libs/json-api/json-api-nestjs-sdk/src/ngModule.ts"
5555
],
5656
"generateExportsField": true
5757
}
@@ -68,7 +68,7 @@
6868
"updateBuildableProjectDepsInPackageJson": true,
6969
"buildableProjectDepsInPackageJsonType": "peerDependencies",
7070
"additionalEntryPoints": [
71-
"libs/json-api/json-api-nestjs-sdk/src/json-api-nestjs-sdk.module.ts"
71+
"libs/json-api/json-api-nestjs-sdk/src/ngModule.ts"
7272
],
7373
"generateExportsField": true
7474
}

‎libs/json-api/json-api-nestjs-sdk/src/index.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
export { JsonApiUtilsService, JsonApiSdkService } from './lib/service';
22
export * from './lib/json-api-js';
33
export { adapterForAxios } from './lib/utils';
4-
export { FilterOperand } from './lib/types';
4+
export {
5+
FilterOperand,
6+
ResourceObject,
7+
AtomicOperations,
8+
Operands,
9+
QueryField,
10+
QueryParams,
11+
} from './lib/types';

‎libs/json-api/json-api-nestjs-sdk/src/json-api-nestjs-sdk.module.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
import { NgModule, ModuleWithProviders, inject } from '@angular/core';
2-
import { HttpClient, HttpClientModule } from '@angular/common/http';
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';
312
import { HttpInnerClient, JsonSdkConfig } from './types';
413
import { AtomicFactory, JSON_API_SDK_CONFIG } from './token';
514
import { resultConfig } from './utils';
@@ -9,51 +18,56 @@ import {
918
AtomicOperationsService,
1019
} from './service';
1120

21+
export const getProviders = (config: JsonSdkConfig) => [
22+
{
23+
provide: JSON_API_SDK_CONFIG,
24+
useValue: resultConfig(config),
25+
},
26+
{
27+
provide: JsonApiUtilsService,
28+
useFactory: () => new JsonApiUtilsService(inject(JSON_API_SDK_CONFIG)),
29+
},
30+
{
31+
provide: JsonApiSdkService,
32+
useFactory: () =>
33+
new JsonApiSdkService(
34+
inject<HttpInnerClient>(HttpClient as any),
35+
inject(JsonApiUtilsService),
36+
inject(JSON_API_SDK_CONFIG)
37+
),
38+
},
39+
{
40+
provide: AtomicFactory,
41+
useFactory: () => {
42+
const jsonApiUtilsService = inject(JsonApiUtilsService);
43+
const config = inject(JSON_API_SDK_CONFIG);
44+
const httpClient = inject<HttpInnerClient>(HttpClient as any);
45+
46+
return () => {
47+
return new AtomicOperationsService(
48+
jsonApiUtilsService,
49+
config,
50+
httpClient
51+
);
52+
};
53+
},
54+
},
55+
];
56+
57+
export const provideJsonApi = (config: JsonSdkConfig) =>
58+
makeEnvironmentProviders(getProviders(config));
59+
1260
@NgModule({
13-
imports: [HttpClientModule],
61+
imports: [],
62+
providers: [provideHttpClient(withInterceptorsFromDi())],
1463
})
1564
export class JsonApiAngular {
1665
static forRoot(config: JsonSdkConfig): ModuleWithProviders<JsonApiAngular> {
1766
return {
1867
ngModule: JsonApiAngular,
19-
providers: [
20-
{
21-
provide: JSON_API_SDK_CONFIG,
22-
useValue: resultConfig(config),
23-
},
24-
{
25-
provide: JsonApiUtilsService,
26-
useFactory: () =>
27-
new JsonApiUtilsService(inject(JSON_API_SDK_CONFIG)),
28-
},
29-
{
30-
provide: JsonApiSdkService,
31-
useFactory: () =>
32-
new JsonApiSdkService(
33-
inject<HttpInnerClient>(HttpClient as any),
34-
inject(JsonApiUtilsService),
35-
inject(JSON_API_SDK_CONFIG)
36-
),
37-
},
38-
{
39-
provide: AtomicFactory,
40-
useFactory: () => {
41-
const jsonApiUtilsService = inject(JsonApiUtilsService);
42-
const config = inject(JSON_API_SDK_CONFIG);
43-
const httpClient = inject<HttpInnerClient>(HttpClient as any);
44-
45-
return () => {
46-
return new AtomicOperationsService(
47-
jsonApiUtilsService,
48-
config,
49-
httpClient
50-
);
51-
};
52-
},
53-
},
54-
],
68+
providers: getProviders(config),
5569
};
5670
}
5771
}
5872

59-
export { AtomicFactory } from './token';
73+
export { AtomicFactory, JSON_API_SDK_CONFIG } from './token';

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export {
2+
JsonApiAngular,
3+
AtomicFactory,
4+
provideJsonApi,
5+
JSON_API_SDK_CONFIG,
6+
getProviders,
7+
} from './lib/json-api-angular';
8+
export { JsonApiUtilsService, JsonApiSdkService } from './lib/service';
9+
export {
10+
FilterOperand,
11+
ResourceObject,
12+
AtomicOperations,
13+
JsonSdkConfig,
14+
} from './lib/types';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ import {
217217
JsonRpcAngular,
218218
JsonRpcAngularConfig,
219219
TransportType,
220-
} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module'
220+
} from '@klerick/nestjs-json-rpc-sdk/ngModule'
221221
import { Subject } from 'rxjs';
222222
import { io } from 'socket.io-client';
223223
import {

‎libs/json-rpc/nestjs-json-rpc-sdk/ng-package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../../tmp/angular-lib/nestjs-json-rpc-sdk",
44
"lib": {
5-
"entryFile": "./src/json-rpc-sdk.module.ts"
5+
"entryFile": "./src/ngModule.ts"
66
}
77
}

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,14 @@
3030
"commands": [
3131
"node tools/scripts/preparation-hybrid-npm-package.mjs nestjs-json-rpc-sdk",
3232
"node tools/scripts/preparation-npm-package.mjs nestjs-json-rpc-sdk",
33-
"nx run nestjs-json-rpc-sdk:compile-for-angular",
34-
"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"
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+
}
3541
],
3642
"cwd": "./",
3743
"parallel": false
@@ -52,7 +58,7 @@
5258
"updateBuildableProjectDepsInPackageJson": true,
5359
"buildableProjectDepsInPackageJsonType": "peerDependencies",
5460
"additionalEntryPoints": [
55-
"libs/json-rpc/nestjs-json-rpc-sdk/src/json-rpc-sdk.module.ts"
61+
"libs/json-rpc/nestjs-json-rpc-sdk/src/ngModule.ts"
5662
],
5763
"generateExportsField": true
5864
}
@@ -69,7 +75,7 @@
6975
"updateBuildableProjectDepsInPackageJson": true,
7076
"buildableProjectDepsInPackageJsonType": "peerDependencies",
7177
"additionalEntryPoints": [
72-
"libs/json-rpc/nestjs-json-rpc-sdk/src/json-rpc-sdk.module.ts"
78+
"libs/json-rpc/nestjs-json-rpc-sdk/src/ngModule.ts"
7379
],
7480
"generateExportsField": true
7581
}

0 commit comments

Comments
 (0)