New Version:)

.gitignore

@@ -39,5 +39,6 @@ testem.log
 Thumbs.db
 
 .nx/cache
+.nx/workspace-data
 .angular
 .dev.env

.prettierignore

@@ -3,3 +3,5 @@
 /coverage
 /.nx/cache
 .angular
+
+/.nx/workspace-data

README.md

@@ -23,24 +23,10 @@ $ npm run seed:run
 ## Running the example app
 
 ```bash
-# build plugin
-$ npm run json-api-nestjs:build
-
 # dev server
-$ npm run example:serve
+$ npm run demo:json-api
 
 ```
-
-## Test
-
-```bash
-# unit tests
-$ nx test json-api-nestjs
-
-# test coverage
-$ nx test json-api-nestjs --coverage
-```
-
 ## License
 
 The plugin is [MIT licensed](LICENSE).

apps/json-api-front/src/app/app.component.ts

@@ -1,12 +1,12 @@
 import { Component, inject, OnInit } from '@angular/core';
 import { NxWelcomeComponent } from './nx-welcome.component';
 import { JsonApiSdkService } from 'json-api-nestjs-sdk';
-import { AtomicFactory } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module';
+import { AtomicFactory } from 'json-api-nestjs-sdk/ngModule';
 import {
   JSON_RPC,
   RPC_BATCH,
   Rpc,
-} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module';
+} from '@klerick/nestjs-json-rpc-sdk/ngModule';
 
 import { RpcService as IRpcService } from '@nestjs-json-api/type-for-rpc';
 import { switchMap } from 'rxjs';

apps/json-api-front/src/app/app.config.ts

@@ -3,15 +3,17 @@ import {
   importProvidersFrom,
   InjectionToken,
 } from '@angular/core';
-import { JsonApiAngular } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module';
+import { JsonApiAngular, provideJsonApi } from 'json-api-nestjs-sdk/ngModule';
 import {
   JsonRpcAngular,
   JsonRpcAngularConfig,
   TransportType,
-} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module';
+  provideJsonRpc,
+} from '@klerick/nestjs-json-rpc-sdk/ngModule';
 import { Subject } from 'rxjs';
 import { webSocket } from 'rxjs/webSocket';
 import { io } from 'socket.io-client';
+import { provideHttpClient, withInterceptors } from '@angular/common/http';
 
 const destroySubject = new Subject<boolean>();
 setTimeout(() => {

apps/json-api-server-e2e/project.json

@@ -13,7 +13,8 @@
       ],
       "options": {
         "jestConfig": "apps/json-api-server-e2e/jest.config.ts",
-        "passWithNoTests": true
+        "passWithNoTests": true,
+        "parallel": 1
       }
     }
   }

apps/json-api-server-e2e/src/json-api/json-api-sdk/atomic-sdk.spec.ts

@@ -86,11 +86,25 @@ describe('Atomic method:', () => {
       );
     }
 
-    await Promise.all(
-      [...usersArray, ...addressArray, ...commentsArray, ...rolesArray].map(
-        (i) => jsonSdk.jonApiSdkService.deleteOne(i)
-      )
-    );
+    for (const item of [
+      ...usersArray,
+      ...addressArray,
+      ...commentsArray,
+      ...rolesArray,
+    ]) {
+      await jsonSdk.jonApiSdkService.deleteOne(item);
+    }
+  });
+
+  it('Try check intreceptor', async () => {
+    const newUser = getUser();
+    newUser.addresses = addressArray[0];
+    try {
+      const result = await jsonSdk.atomicFactory().postOne(newUser).run();
+      usersId.push(result[0].id);
+    } catch (e) {
+      console.log(e);
+    }
   });
 
   it('Should be correct work', async () => {

apps/json-api-server-e2e/src/json-api/json-api-sdk/get-method.spec.ts

@@ -5,6 +5,7 @@ import { faker } from '@faker-js/faker';
 import { FilterOperand, JsonSdkPromise } from 'json-api-nestjs-sdk';
 import { getUser } from '../utils/data-utils';
 import { creatSdk, run } from '../utils/run-application';
+import { AxiosError } from 'axios';
 
 let app: INestApplication;
 
@@ -90,9 +91,10 @@ describe('GET method:', () => {
         return Promise.all(tmp);
       })
     );
+    await Promise.all(addressArray);
     await Promise.all(
-      [...usersArray, ...addressArray, ...commentsArray, ...rolesArray].map(
-        (i) => jsonSdk.jonApiSdkService.deleteOne(i)
+      [...usersArray, ...commentsArray, ...rolesArray].map((i) =>
+        jsonSdk.jonApiSdkService.deleteOne(i)
       )
     );
   });

apps/json-api-server/src/app/resources/controllers/extend-user/extend-user.controller.ts

@@ -29,6 +29,7 @@ import {
   HttpExceptionMethodFilter,
 } from '../../service/http-exception.filter';
 import { GuardService, EntityName } from '../../service/guard.service';
+import { AtomicInterceptor } from '../../service/atomic.interceptor';
 
 @UseGuards(GuardService)
 @UseFilters(new HttpExceptionFilter())
@@ -52,6 +53,7 @@ export class ExtendUserController extends JsonBaseController<Users> {
     return super.patchRelationship(id, relName, input);
   }
 
+  // @UseInterceptors(AtomicInterceptor)
   postOne(inputData: PostData<Users>): Promise<ResourceObject<Users>> {
     return super.postOne(inputData);
   }

apps/json-api-server/src/app/resources/service/atomic.interceptor.ts

@@ -0,0 +1,18 @@
+import {
+  CallHandler,
+  ExecutionContext,
+  NestInterceptor,
+  Injectable,
+} from '@nestjs/common';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class AtomicInterceptor<T> implements NestInterceptor {
+  intercept(context: ExecutionContext, next: CallHandler<T>): Observable<T> {
+    const isAtomic = context.getArgByIndex(3);
+    if (isAtomic) {
+      console.log('call from atomic operation');
+    }
+    return next.handle();
+  }
+}

apps/json-api-server/src/main.ts

@@ -25,7 +25,10 @@ async function bootstrap() {
   SwaggerModule.setup(
     'swagger',
     app,
-    () => SwaggerModule.createDocument(app, config),
+    () => ({
+      ...SwaggerModule.createDocument(app, config),
+      openapi: '3.1.0',
+    }),
     {}
   );
   await app.init();

libs/database/src/lib/config.ts

@@ -1,11 +1,11 @@
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 
 import { config as ormConfig } from './config-cli';
-import { Roles, Comments, Users, Addresses, BookList } from './entities';
+import * as allEntities from './entities';
 
 export const config: TypeOrmModuleOptions = {
   ...ormConfig,
   ...{
-    entities: [Roles, Comments, Users, Addresses, BookList],
+    entities: Object.values(allEntities) as any,
   },
 };

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

@@ -93,8 +93,7 @@ const [addressPost, managerPost, rolesPost, userPost] = await jsonSdk
 ```
 or you can use Angular module:
 ```typescript
-import { JsonApiAngular, AtomicFactory } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module';
-import { JsonApiSdkService } from 'json-api-nestjs-sdk';
+import { JsonApiAngular, AtomicFactory, JsonApiSdkService } from 'json-api-nestjs-sdk/ngModule';
 
 @Component({
   standalone: true,

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

@@ -1,6 +1,6 @@
 {
   "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../../tmp/angular-lib/json-api-nestjs-sdk",
+  "dest": "../../../tmp/angular-lib/ngModule",
   "lib": {
     "entryFile": "../../index.ts"
   }

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

@@ -51,7 +51,7 @@
         "updateBuildableProjectDepsInPackageJson": true,
         "buildableProjectDepsInPackageJsonType": "peerDependencies",
         "additionalEntryPoints": [
-          "libs/json-api/json-api-nestjs-sdk/src/json-api-nestjs-sdk.module.ts"
+          "libs/json-api/json-api-nestjs-sdk/src/ngModule.ts"
         ],
         "generateExportsField": true
       }
@@ -68,7 +68,7 @@
         "updateBuildableProjectDepsInPackageJson": true,
         "buildableProjectDepsInPackageJsonType": "peerDependencies",
         "additionalEntryPoints": [
-          "libs/json-api/json-api-nestjs-sdk/src/json-api-nestjs-sdk.module.ts"
+          "libs/json-api/json-api-nestjs-sdk/src/ngModule.ts"
         ],
         "generateExportsField": true
       }

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

@@ -1,4 +1,11 @@
 export { JsonApiUtilsService, JsonApiSdkService } from './lib/service';
 export * from './lib/json-api-js';
 export { adapterForAxios } from './lib/utils';
-export { FilterOperand } from './lib/types';
+export {
+  FilterOperand,
+  ResourceObject,
+  AtomicOperations,
+  Operands,
+  QueryField,
+  QueryParams,
+} from './lib/types';

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

@@ -1,5 +1,14 @@
-import { NgModule, ModuleWithProviders, inject } from '@angular/core';
-import { HttpClient, HttpClientModule } from '@angular/common/http';
+import {
+  NgModule,
+  ModuleWithProviders,
+  inject,
+  makeEnvironmentProviders,
+} from '@angular/core';
+import {
+  HttpClient,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { HttpInnerClient, JsonSdkConfig } from './types';
 import { AtomicFactory, JSON_API_SDK_CONFIG } from './token';
 import { resultConfig } from './utils';
@@ -9,51 +18,56 @@ import {
   AtomicOperationsService,
 } from './service';
 
+export const getProviders = (config: JsonSdkConfig) => [
+  {
+    provide: JSON_API_SDK_CONFIG,
+    useValue: resultConfig(config),
+  },
+  {
+    provide: JsonApiUtilsService,
+    useFactory: () => new JsonApiUtilsService(inject(JSON_API_SDK_CONFIG)),
+  },
+  {
+    provide: JsonApiSdkService,
+    useFactory: () =>
+      new JsonApiSdkService(
+        inject<HttpInnerClient>(HttpClient as any),
+        inject(JsonApiUtilsService),
+        inject(JSON_API_SDK_CONFIG)
+      ),
+  },
+  {
+    provide: AtomicFactory,
+    useFactory: () => {
+      const jsonApiUtilsService = inject(JsonApiUtilsService);
+      const config = inject(JSON_API_SDK_CONFIG);
+      const httpClient = inject<HttpInnerClient>(HttpClient as any);
+
+      return () => {
+        return new AtomicOperationsService(
+          jsonApiUtilsService,
+          config,
+          httpClient
+        );
+      };
+    },
+  },
+];
+
+export const provideJsonApi = (config: JsonSdkConfig) =>
+  makeEnvironmentProviders(getProviders(config));
+
 @NgModule({
-  imports: [HttpClientModule],
+  imports: [],
+  providers: [provideHttpClient(withInterceptorsFromDi())],
 })
 export class JsonApiAngular {
   static forRoot(config: JsonSdkConfig): ModuleWithProviders<JsonApiAngular> {
     return {
       ngModule: JsonApiAngular,
-      providers: [
-        {
-          provide: JSON_API_SDK_CONFIG,
-          useValue: resultConfig(config),
-        },
-        {
-          provide: JsonApiUtilsService,
-          useFactory: () =>
-            new JsonApiUtilsService(inject(JSON_API_SDK_CONFIG)),
-        },
-        {
-          provide: JsonApiSdkService,
-          useFactory: () =>
-            new JsonApiSdkService(
-              inject<HttpInnerClient>(HttpClient as any),
-              inject(JsonApiUtilsService),
-              inject(JSON_API_SDK_CONFIG)
-            ),
-        },
-        {
-          provide: AtomicFactory,
-          useFactory: () => {
-            const jsonApiUtilsService = inject(JsonApiUtilsService);
-            const config = inject(JSON_API_SDK_CONFIG);
-            const httpClient = inject<HttpInnerClient>(HttpClient as any);
-
-            return () => {
-              return new AtomicOperationsService(
-                jsonApiUtilsService,
-                config,
-                httpClient
-              );
-            };
-          },
-        },
-      ],
+      providers: getProviders(config),
     };
   }
 }
 
-export { AtomicFactory } from './token';
+export { AtomicFactory, JSON_API_SDK_CONFIG } from './token';