chore: Some changes for developing

Author: klerick

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/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/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/src/lib/mock-utils/db-for-test

@@ -300,6 +300,8 @@ CREATE TABLE public.users (
     first_name character varying,
     last_name character varying,
     is_active boolean DEFAULT false,
+    test_real real[],
+    test_array_null real[],
     manager_id integer,
     addresses_id integer,
     user_groups_id integer,

libs/json-api/json-api-nestjs/src/lib/mock-utils/entities/pods.ts

@@ -3,7 +3,7 @@ import {
   CreateDateColumn,
   Entity,
   ManyToMany,
-  PrimaryGeneratedColumn,
+  PrimaryColumn,
   UpdateDateColumn,
 } from 'typeorm';
 
@@ -13,8 +13,8 @@ export type IPods = Pods;
 
 @Entity('pods')
 export class Pods {
-  @PrimaryGeneratedColumn()
-  public id!: number;
+  @PrimaryColumn()
+  public id!: string;
 
   @Column({
     type: 'varchar',

libs/json-api/json-api-nestjs/src/lib/mock-utils/entities/users.ts

@@ -37,6 +37,22 @@ export class Users {
   })
   public firstName!: string;
 
+  @Column({
+    name: 'test_real',
+    type: 'real',
+    array: true,
+    default: [],
+  })
+  public testReal!: number[];
+
+  @Column({
+    name: 'test_array_null',
+    type: 'real',
+    array: true,
+    nullable: true,
+  })
+  public testArrayNull!: number[] | null;
+
   @Column({
     name: 'last_name',
     type: 'varchar',

libs/json-api/json-api-nestjs/src/lib/mock-utils/utils/provider-entities.ts

@@ -7,6 +7,7 @@ import {
   Comments,
   Entities,
   Notes,
+  Pods,
   Roles,
   UserGroups,
 } from '../entities';
@@ -52,12 +53,17 @@ export function getRepository(module: TestingModule) {
     getRepositoryToken(UserGroups, DEFAULT_CONNECTION_NAME)
   );
 
+  const podsRepository = module.get<Repository<Pods>>(
+    getRepositoryToken(Pods, DEFAULT_CONNECTION_NAME)
+  );
+
   return {
     userRepository,
     addressesRepository,
     notesRepository,
     commentsRepository,
     rolesRepository,
     userGroupRepository,
+    podsRepository,
   };
 }

libs/json-api/json-api-nestjs/src/lib/mock-utils/utils/pull-data.ts

@@ -51,6 +51,9 @@ export async function pullUser(userPero: Repository<Users>) {
     lastName: user.lastName,
     firstName: user.firstName,
   });
+  user.testReal = [faker.number.float({ fractionDigits: 4 })];
+  user.testArrayNull = null;
+
   user.testDate = faker.date.anytime();
 
   return userPero.save(user);

tools/scripts/preparation-hybrid-npm-package.mjs

@@ -1,5 +1,5 @@
 import { readFileSync, writeFileSync, unlinkSync } from 'fs';
-import {sep, join} from 'path'
+import { sep, join } from 'path';
 
 import devkit from '@nx/devkit';
 const { readCachedProjectGraph } = devkit;
@@ -11,21 +11,17 @@ function invariant(condition, message) {
   }
 }
 
-function readJson(type = 'mjs'){
+function readJson(type = 'mjs') {
   try {
     return JSON.parse(readFileSync(`${type}/package.json`).toString());
   } catch (e) {
     console.error(`Error reading package.json file from library build output.`);
   }
 }
 
-function addTypeToPath(path, type = 'mjs'){
-  const [dot, ...other] = path.split(sep)
-  return [
-    dot,
-    type,
-    ...other
-  ].join(sep)
+function addTypeToPath(path, type = 'mjs') {
+  const [dot, ...other] = path.split(sep);
+  return [dot, type, ...other].join(sep);
 }
 
 const [, , name] = process.argv;
@@ -46,65 +42,54 @@ invariant(
 process.chdir(outputPath);
 
 const angularModuleMap = {
-  'nestjs-json-rpc-sdk': 'json-rpc-sdk.module',
-  'json-api-nestjs-sdk': 'json-api-nestjs-sdk.module'
-}
+  'nestjs-json-rpc-sdk': 'ngModule',
+  'json-api-nestjs-sdk': 'ngModule',
+};
 
 const mjsJson = readJson();
+
 const angularModule = angularModuleMap[name];
 const angularModulePath = `./${angularModule}`;
 
-const angularPath = mjsJson.exports[angularModulePath]
+const angularPath = mjsJson.exports[angularModulePath];
 
-mjsJson.module = addTypeToPath(mjsJson.main)
-mjsJson.main = addTypeToPath(mjsJson.main, 'cjs')
-mjsJson.es2015 = mjsJson.module
-mjsJson.types = "./mjs/src/index.d.ts";
-mjsJson.exports[angularModulePath] = addTypeToPath(angularPath)
+mjsJson.module = addTypeToPath(mjsJson.main);
+mjsJson.main = addTypeToPath(mjsJson.main, 'cjs');
+mjsJson.es2015 = mjsJson.module;
+mjsJson.types = './mjs/src/index.d.ts';
+mjsJson.exports[angularModulePath] = addTypeToPath(angularPath);
 mjsJson.exports['.'] = {
   types: mjsJson.types,
   node: mjsJson.main,
   require: mjsJson.main,
   es2015: mjsJson.es2015,
   default: mjsJson.es2015,
-}
+};
 mjsJson.peerDependencies = {
   ...mjsJson.dependencies,
-  ...mjsJson.peerDependencies
-}
+  ...mjsJson.peerDependencies,
+};
 mjsJson.typesVersions = {
-  "*": {
+  '*': {
     [angularModule]: [
-      mjsJson.exports[angularModulePath].replace('.js', '.d.ts')
-    ]
-  }
-}
-delete mjsJson.type
-delete mjsJson.dependencies
+      mjsJson.exports[angularModulePath].replace('.js', '.d.ts'),
+    ],
+  },
+};
+delete mjsJson.type;
+delete mjsJson.dependencies;
 
 writeFileSync(`package.json`, JSON.stringify(mjsJson, null, 2));
-writeFileSync(
-  'README.md',
-  readFileSync(join('mjs', 'README.md').toString()),
-)
+writeFileSync('README.md', readFileSync(join('mjs', 'README.md').toString()));
 try {
-  unlinkSync(join('cjs', 'package.json'))
-
-} catch (e) {
-
-}
+  unlinkSync(join('cjs', 'package.json'));
+} catch (e) {}
 try {
-  unlinkSync(join('mjs', 'package.json'))
-} catch (e) {
-
-}
+  unlinkSync(join('mjs', 'package.json'));
+} catch (e) {}
 try {
-  unlinkSync(join('mjs', 'README.md'))
-} catch (e) {
-
-}
+  unlinkSync(join('mjs', 'README.md'));
+} catch (e) {}
 try {
-  unlinkSync(join('cjs', 'README.md'))
-} catch (e) {
-
-}
+  unlinkSync(join('cjs', 'README.md'));
+} catch (e) {}

tools/scripts/prepare-for-angular.mjs

@@ -11,31 +11,32 @@ const graph = readCachedProjectGraph();
 const project = graph.nodes[name];
 
 const outputPath = project.data?.targets?.build?.options?.outputPath;
-const sourceRoot = project.data?.sourceRoot
+const sourceRoot = project.data?.sourceRoot;
 
-const packageJson = JSON.parse(readFileSync(`${outputPath}/package.json`).toString());
-const angularFile = Object.keys(packageJson.exports).filter(i => !['./package.json', '.'].includes(i)).pop().replace('./', '')
-const [_, ...pathToModule] =  sourceRoot.split('/')
-
-const [nameSpace] = pathToModule
+const packageJson = JSON.parse(
+  readFileSync(`${outputPath}/package.json`).toString()
+);
+const angularFile = Object.keys(packageJson.exports)
+  .filter((i) => !['./package.json', '.'].includes(i))
+  .pop()
+  .replace('./', '');
+const [_, ...pathToModule] = sourceRoot.split('/');
 
-const TEMP_FILE_PATH = 'libs/index.ts'
-const ANGULAR_MODULE_PATH = `tmp/angular-lib/${name}/esm2022/${nameSpace}/${name}/src/lib/${angularName}.mjs`
-const LIB_ANGULAR_MODULE_PATH = `${outputPath}/mjs/src/lib/${angularName}.js`
+const [nameSpace] = pathToModule;
 
+const TEMP_FILE_PATH = 'libs/index.ts';
+const ANGULAR_MODULE_PATH = `tmp/angular-lib/ngModule/esm2022/${nameSpace}/${name}/src/lib/${angularName}.mjs`;
+const LIB_ANGULAR_MODULE_PATH = `${outputPath}/mjs/src/lib/${angularName}.js`;
 
 writeFileSync(
   TEMP_FILE_PATH,
   `export * from './${pathToModule.join('/')}/${angularFile}';`
 );
 
-promisify(exec)(
-  `nx run ${name}:compile-for-angular`
-).then(r => {
-  writeFileSync(LIB_ANGULAR_MODULE_PATH, readFileSync(ANGULAR_MODULE_PATH))
-}).finally(() => {
-  unlinkSync(TEMP_FILE_PATH)
-})
-
-
-
+promisify(exec)(`nx run ${name}:compile-for-angular`)
+  .then((r) => {
+    writeFileSync(LIB_ANGULAR_MODULE_PATH, readFileSync(ANGULAR_MODULE_PATH));
+  })
+  .finally(() => {
+    unlinkSync(TEMP_FILE_PATH);
+  });