Skip to content

Commit

Permalink
refactor(nestjs-json-rpc-sdk,json-api-nestjs-sdk): Remove Angular module
Browse files Browse the repository at this point in the history
remove build Angular module

BREAKING CHANGE: now do not export Angular module
  • Loading branch information
klerick committed Dec 7, 2024
1 parent 519e3c0 commit 08e3bb5
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 122 deletions.
11 changes: 7 additions & 4 deletions libs/json-api/json-api-nestjs-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ const [addressPost, managerPost, rolesPost, userPost] = await jsonSdk
```
or you can use Angular module:
```typescript
import { JsonApiAngular, AtomicFactory, JsonApiSdkService } from 'json-api-nestjs-sdk/ngModule';
import { provideJsonApi, AtomicFactory, JsonApiSdkService } from 'json-api-nestjs-sdk/ngModule';
import {
provideHttpClient,
withFetch,
} from '@angular/common/http';

@Component({
standalone: true,
Expand All @@ -115,9 +119,8 @@ const angularConfig: JsonSdkConfig = {

bootstrapApplication(AppComponent, {
providers: [
importProvidersFrom(
JsonApiAngular.forRoot(angularConfig)
),
provideHttpClient(withFetch()),
provideJsonApi(angularConfig)
],
}).catch((err) =>
console.error(err)
Expand Down
11 changes: 9 additions & 2 deletions libs/json-api/json-api-nestjs-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"engines": {
"node": ">= 16.0.0"
},
"description": "JsonAPi Plugin for NestJs",
"description": "Helper for client JsonAPi Plugin for NestJs",
"contributors": [
{
"email": "[email protected]",
Expand All @@ -28,5 +28,12 @@
"json-api",
"typeorm",
"CRUD"
]
],
"peerDependencies": {
"@angular/common": ">=19.0.0 <20.0.0",
"@angular/core": ">=19.0.0 <20.0.0",
"axios": "^1.6.0",
"reflect-metadata": "^0.1.13",
"tslib": "^2.3.0"
}
}
3 changes: 1 addition & 2 deletions libs/json-api/json-api-nestjs-sdk/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk",
"commands": [
"node tools/scripts/preparation-hybrid-npm-package.mjs json-api-nestjs-sdk",
"node tools/scripts/preparation-npm-package.mjs json-api-nestjs-sdk",
"node tools/scripts/prepare-for-angular.mjs json-api-nestjs-sdk json-api-angular"
"node tools/scripts/preparation-npm-package.mjs json-api-nestjs-sdk"
],
"cwd": "./",
"parallel": false
Expand Down
26 changes: 2 additions & 24 deletions libs/json-api/json-api-nestjs-sdk/src/lib/json-api-angular.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import {
NgModule,
ModuleWithProviders,
inject,
makeEnvironmentProviders,
} from '@angular/core';
import {
HttpClient,
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { inject, makeEnvironmentProviders } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { HttpInnerClient, JsonSdkConfig } from './types';
import { AtomicFactory, JSON_API_SDK_CONFIG } from './token';
import { resultConfig } from './utils';
Expand Down Expand Up @@ -57,17 +48,4 @@ export const getProviders = (config: JsonSdkConfig) => [
export const provideJsonApi = (config: JsonSdkConfig) =>
makeEnvironmentProviders(getProviders(config));

@NgModule({
imports: [],
providers: [provideHttpClient(withInterceptorsFromDi())],
})
export class JsonApiAngular {
static forRoot(config: JsonSdkConfig): ModuleWithProviders<JsonApiAngular> {
return {
ngModule: JsonApiAngular,
providers: getProviders(config),
};
}
}

export { AtomicFactory, JSON_API_SDK_CONFIG } from './token';
1 change: 0 additions & 1 deletion libs/json-api/json-api-nestjs-sdk/src/ngModule.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export {
JsonApiAngular,
AtomicFactory,
provideJsonApi,
JSON_API_SDK_CONFIG,
Expand Down
6 changes: 5 additions & 1 deletion libs/json-api/json-api-nestjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@
"json-api",
"typeorm",
"CRUD"
]
],
"peerDependencies": {
"reflect-metadata": "^0.1.13",
"tslib": "^2.3.0"
}
}
11 changes: 7 additions & 4 deletions libs/json-rpc/nestjs-json-rpc-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,14 @@ You can use Angular module:
```typescript

import {
JsonRpcAngular,
provideJsonRpc,
JsonRpcAngularConfig,
TransportType,
} from '@klerick/nestjs-json-rpc-sdk/ngModule'
import {
provideHttpClient,
withFetch,
} from '@angular/common/http';
import { Subject } from 'rxjs';
import { io } from 'socket.io-client';
import {
Expand Down Expand Up @@ -275,9 +279,8 @@ const ioConfig: JsonRpcAngularConfig = {

bootstrapApplication(AppComponent, {
providers: [
importProvidersFrom(
JsonRpcAngular.forRoot(httpConfig)
),
provideHttpClient(withFetch()),
provideJsonRpc(httpConfig),
],
}).catch((err) =>
console.error(err)
Expand Down
10 changes: 1 addition & 9 deletions libs/json-rpc/nestjs-json-rpc-sdk/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,7 @@
"outputPath": "dist/libs/json-rpc/nestjs-json-rpc-sdk",
"commands": [
"node tools/scripts/preparation-hybrid-npm-package.mjs nestjs-json-rpc-sdk",
"node tools/scripts/preparation-npm-package.mjs nestjs-json-rpc-sdk",
{
"command": "nx run nestjs-json-rpc-sdk:compile-for-angular",
"forwardAllArgs": false
},
{
"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",
"forwardAllArgs": false
}
"node tools/scripts/preparation-npm-package.mjs nestjs-json-rpc-sdk"
],
"cwd": "./",
"parallel": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import {
makeEnvironmentProviders,
ModuleWithProviders,
NgModule,
} from '@angular/core';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { makeEnvironmentProviders } from '@angular/core';

import { JSON_RPC_SDK_CONFIG } from './tokens';
import { JsonRpcAngularConfig } from '../types';
Expand All @@ -18,23 +10,3 @@ export const provideJsonRpc = (config: JsonRpcAngularConfig) =>
provide: JSON_RPC_SDK_CONFIG,
},
]);

@NgModule({
imports: [],
providers: [provideHttpClient(withInterceptorsFromDi())],
})
export class JsonRpcAngular {
static forRoot(
config: JsonRpcAngularConfig
): ModuleWithProviders<JsonRpcAngular> {
return {
ngModule: JsonRpcAngular,
providers: [
{
useValue: config,
provide: JSON_RPC_SDK_CONFIG,
},
],
};
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
export {
JsonRpcAngular,
provideJsonRpc,
} from './angular/json-rpc-angular.module';
export { provideJsonRpc } from './angular/json-rpc-angular.module';
export { JsonRpcAngularConfig, TransportType, Rpc } from './types';
export { JSON_RPC, RPC_BATCH } from './angular/tokens';
42 changes: 0 additions & 42 deletions tools/scripts/prepare-for-angular.mjs

This file was deleted.

0 comments on commit 08e3bb5

Please sign in to comment.