fix(json-api-server): fix type in some place

Author: klerick

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

@@ -10,7 +10,6 @@ export {
   UnionToTuple,
   EntityParam,
   TypeField,
-  ObjectLiteral,
 } from './lib/types';
 export {
   JsonApiTransformerService,

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/atomic-operation.module.ts

@@ -7,6 +7,7 @@ import {
   NestModule,
 } from '@nestjs/common';
 import { DiscoveryModule, RouterModule } from '@nestjs/core';
+import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
 
 import { OperationController } from './controllers';
 import { ExplorerService, ExecuteService, SwaggerService } from './service';
@@ -17,7 +18,6 @@ import {
   ZodInputOperation,
   AsyncIterate,
 } from './factory';
-import { AnyEntity, EntityClass } from '../../types';
 import { MAP_CONTROLLER_INTERCEPTORS } from './constants';
 
 @Module({})

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/constants/index.ts

@@ -5,5 +5,3 @@ export const MAP_CONTROLLER_INTERCEPTORS = Symbol(
 export const MAP_ENTITY = Symbol('MAP_ENTITY');
 export const ZOD_INPUT_OPERATION = Symbol('ZOD_INPUT_OPERATION');
 export const ASYNC_ITERATOR_FACTORY = Symbol('ASYNC_ITERATOR_FACTORY');
-export const KEY_MAIN_INPUT_SCHEMA = 'atomic:operations';
-export const KEY_MAIN_OUTPUT_SCHEMA = 'atomic:results';

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/controllers/operation.controller.spec.ts

@@ -2,17 +2,20 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { DiscoveryModule } from '@nestjs/core';
 import { HttpException } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module';
+import {
+  KEY_MAIN_OUTPUT_SCHEMA,
+  Operation,
+} from '@klerick/json-api-nestjs-shared';
 
 import { OperationController } from './operation.controller';
 import { ExecuteService, ExplorerService } from '../service';
-import { InputArray, Operation } from '../utils';
-import { JsonBaseController } from '../../mixin/controllers/json-base.controller';
+import { InputArray } from '../utils';
+import { JsonBaseController } from '../../mixin/controllers';
 
 import { Users } from '../../../utils/___test___/test-classes.helper';
 
 import {
   ASYNC_ITERATOR_FACTORY,
-  KEY_MAIN_OUTPUT_SCHEMA,
   MAP_CONTROLLER_ENTITY,
   MAP_ENTITY,
   ZOD_INPUT_OPERATION,
@@ -21,7 +24,6 @@ import {
 
 import { OperationMethode } from '../types';
 import { AsyncLocalStorage } from 'async_hooks';
-import { ObjectLiteral } from '../../../types';
 import { RUN_IN_TRANSACTION_FUNCTION } from '../../../constants';
 
 describe('OperationController', () => {
@@ -106,7 +108,7 @@ describe('OperationController', () => {
       const getMethodNameByParamSpy = jest
         .spyOn(explorerService, 'getMethodNameByParam')
         .mockReturnValue(
-          paramsForExecuteMock[0].methodName as OperationMethode<ObjectLiteral>
+          paramsForExecuteMock[0].methodName as OperationMethode<object>
         );
       const getModulesByControllerSpy = jest
         .spyOn(explorerService, 'getParamsForMethod')

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/controllers/operation.controller.ts

@@ -8,11 +8,13 @@ import {
   Type,
 } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module';
-
+import {
+  KEY_MAIN_INPUT_SCHEMA,
+  KEY_MAIN_OUTPUT_SCHEMA,
+} from '@klerick/json-api-nestjs-shared';
 import { InputArray } from '../utils';
 import { InputOperationPipe } from '../pipes/input-operation.pipe';
 import { ExecuteService, ExplorerService } from '../service';
-import { KEY_MAIN_INPUT_SCHEMA, KEY_MAIN_OUTPUT_SCHEMA } from '../constants';
 import { OperationMethode, ParamsForExecute } from '../types';
 import { JsonBaseController } from '../../mixin/controllers/json-base.controller';
 import { ValidateQueryError } from '../../../types';

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/factory/map-controller-entity.ts

@@ -1,6 +1,6 @@
 import { DynamicModule, ValueProvider } from '@nestjs/common';
 import { Type } from '@nestjs/common/interfaces/type.interface';
-import { EntityClass, AnyEntity } from '../../../types';
+import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
 import { MapController } from '../types';
 import { MAP_CONTROLLER_ENTITY } from '../constants';
 

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/factory/map-entity-name-to-entity.ts

@@ -1,10 +1,12 @@
 import { ValueProvider } from '@nestjs/common';
+import {
+  getEntityName,
+  AnyEntity,
+  EntityClass,
+} from '@klerick/json-api-nestjs-shared';
 import { kebabCase } from 'change-case-commonjs';
 import { MapEntity } from '../types';
 import { MAP_ENTITY } from '../constants';
-import { AnyEntity, EntityClass } from '../../../types';
-
-import { getEntityName } from '@klerick/json-api-nestjs-shared';
 
 export function MapEntityNameToEntity(
   entities: EntityClass<AnyEntity>[]

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/factory/zod-input-operation.ts

@@ -1,12 +1,12 @@
 import { FactoryProvider } from '@nestjs/common';
+import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
 import { MAP_CONTROLLER_ENTITY, ZOD_INPUT_OPERATION } from '../constants';
 import { MapController } from '../types';
 import { zodInputOperation, ZodInputOperation } from '../utils';
 import { ENTITY_PARAM_MAP } from '../../../constants';
 import { EntityParamMap } from '../../mixin/types';
-import { AnyEntity, EntityClass, ObjectLiteral } from '../../../types';
 
-export function ZodInputOperation<E extends ObjectLiteral>(): FactoryProvider<
+export function ZodInputOperation<E extends object>(): FactoryProvider<
   ZodInputOperation<E>
 > {
   return {

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/pipes/input-operation.pipe.spec.ts

@@ -1,4 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
+import { KEY_MAIN_INPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
 import { ZodError } from 'zod';
 import {
   InternalServerErrorException,
@@ -7,7 +8,7 @@ import {
 
 import { InputOperationPipe } from './input-operation.pipe';
 
-import { KEY_MAIN_INPUT_SCHEMA, ZOD_INPUT_OPERATION } from '../constants';
+import { ZOD_INPUT_OPERATION } from '../constants';
 import { ZodInputOperation } from '../utils';
 
 describe('PatchInputPipe', () => {

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/pipes/input-operation.pipe.ts

@@ -4,11 +4,12 @@ import {
   Inject,
   PipeTransform,
 } from '@nestjs/common';
+import { KEY_MAIN_INPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
 import { errorMap } from 'zod-validation-error';
 import { ZodError } from 'zod';
 import { JSONValue } from '../../mixin/types';
 import { InputArray, ZodInputOperation } from '../utils';
-import { KEY_MAIN_INPUT_SCHEMA, ZOD_INPUT_OPERATION } from '../constants';
+import { ZOD_INPUT_OPERATION } from '../constants';
 
 export class InputOperationPipe
   implements PipeTransform<JSONValue, InputArray>

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/service/execute.service.spec.ts

@@ -1,11 +1,11 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ModuleRef } from '@nestjs/core';
 import { ROUTE_ARGS_METADATA } from '@nestjs/common/constants';
+import { KEY_MAIN_INPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
 import { ExecuteService, isZodError } from './execute.service';
 import { IterateFactory } from '../factory';
 import {
   ASYNC_ITERATOR_FACTORY,
-  KEY_MAIN_INPUT_SCHEMA,
   MAP_CONTROLLER_INTERCEPTORS,
 } from '../constants';
 

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/service/execute.service.ts

@@ -17,6 +17,7 @@ import {
   ObjectTyped,
   ResourceObject,
   ResourceObjectRelationships,
+  KEY_MAIN_INPUT_SCHEMA,
 } from '@klerick/json-api-nestjs-shared';
 import {
   InterceptorsConsumer,
@@ -29,7 +30,6 @@ import { AsyncLocalStorage } from 'async_hooks';
 import { MapControllerInterceptor, ParamsForExecute } from '../types';
 import {
   ASYNC_ITERATOR_FACTORY,
-  KEY_MAIN_INPUT_SCHEMA,
   MAP_CONTROLLER_INTERCEPTORS,
 } from '../constants';
 import { IterateFactory } from '../factory';

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/service/explorer.service.spec.ts

@@ -1,11 +1,12 @@
 import { Test } from '@nestjs/testing';
 import { ModulesContainer } from '@nestjs/core';
+import { Operation } from '@klerick/json-api-nestjs-shared';
 import {
   MAP_ENTITY,
   MAP_CONTROLLER_ENTITY,
   MAP_CONTROLLER_INTERCEPTORS,
 } from '../constants';
-import { Operation } from '../utils';
+
 import { ExplorerService } from './explorer.service';
 
 describe('ExplorerService', () => {

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/service/explorer.service.ts

@@ -1,11 +1,11 @@
 import { Inject, Injectable, Type } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module';
 import { ModulesContainer } from '@nestjs/core';
-import { RelationKeys } from '@klerick/json-api-nestjs-shared';
+import { RelationKeys, Operation } from '@klerick/json-api-nestjs-shared';
 import { MAP_CONTROLLER_ENTITY, MAP_ENTITY } from '../constants';
 import { MapController, MapEntity, OperationMethode } from '../types';
 
-import { InputArray, Operation } from '../utils';
+import { InputArray } from '../utils';
 import { JsonBaseController } from '../../mixin/controllers/json-base.controller';
 import {
   PatchData,

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/types/index.ts

@@ -1,8 +1,8 @@
 import { NestInterceptor, Type } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module';
 import { Controller } from '@nestjs/common/interfaces';
-import { EntityClass } from '../../../types';
-import { JsonBaseController } from '../../mixin/controllers/json-base.controller';
+import { EntityClass } from '@klerick/json-api-nestjs-shared';
+import { JsonBaseController } from '../../mixin/controllers';
 
 export type MapControllerInterceptor = Map<
   Controller,

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/utils/zod/zod-helper.spec.ts

@@ -1,8 +1,13 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { RelationKeys } from '@klerick/json-api-nestjs-shared';
-import { z, ZodError } from 'zod';
 import {
+  RelationKeys,
+  KEY_MAIN_INPUT_SCHEMA,
   Operation,
+  AnyEntity,
+  EntityClass,
+} from '@klerick/json-api-nestjs-shared';
+import { z, ZodError } from 'zod';
+import {
   ZodAdd,
   zodAdd,
   zodInputOperation,
@@ -16,14 +21,12 @@ import {
 } from './zod-helper';
 
 import { MapController } from '../../types';
-import { KEY_MAIN_INPUT_SCHEMA } from '../../constants';
-
-import { AnyEntity, EntityClass, UnionToTuple } from '../../../../types';
-import { JsonBaseController } from '../../../mixin/controllers/json-base.controller';
+import { JsonBaseController } from '../../../mixin/controllers';
 import { mapMock } from '../../../../utils/___test___/test.helper';
 import { Users } from '../../../../utils/___test___/test-classes.helper';
 import { ENTITY_PARAM_MAP } from '../../../../constants';
 import { EntityParamMap } from '../../../mixin/types';
+import { UnionToTuple } from '../../../../types';
 
 describe('ZodHelperSpec', () => {
   afterEach(() => {

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/utils/zod/zod-helper.ts

@@ -1,4 +1,11 @@
-import { getEntityName, RelationKeys } from '@klerick/json-api-nestjs-shared';
+import {
+  getEntityName,
+  RelationKeys,
+  KEY_MAIN_INPUT_SCHEMA,
+  Operation,
+  AnyEntity,
+  EntityClass,
+} from '@klerick/json-api-nestjs-shared';
 import {
   z,
   ZodArray,
@@ -11,18 +18,12 @@ import {
   ZodUnion,
 } from 'zod';
 import { kebabCase } from 'change-case-commonjs';
-import { KEY_MAIN_INPUT_SCHEMA } from '../../constants';
+
 import { MapController } from '../../types';
 
-import { AnyEntity, EntityClass, UnionToTuple } from '../../../../types';
+import { UnionToTuple } from '../../../../types';
 import { EntityParamMap } from '../../../mixin/types';
 
-export enum Operation {
-  add = 'add',
-  update = 'update',
-  remove = 'remove',
-}
-
 const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
 type Literal = z.infer<typeof literalSchema>;
 type Json = Literal | { [key: string]: Json } | Json[];

libs/json-api/json-api-nestjs/src/lib/modules/mixin/decorators/json-api/json-api.decorator.ts

@@ -1,8 +1,8 @@
+import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
 import {
   JSON_API_DECORATOR_ENTITY,
   JSON_API_DECORATOR_OPTIONS,
 } from '../../../../constants';
-import { AnyEntity, EntityClass } from '../../../../types';
 import { DecoratorOptions } from '../../types';
 
 export function JsonApi(

libs/json-api/json-api-nestjs/src/lib/modules/mixin/helpers/utils.ts

@@ -1,7 +1,11 @@
-import { getEntityName, ObjectTyped } from '@klerick/json-api-nestjs-shared';
+import {
+  getEntityName,
+  ObjectTyped,
+  EntityClass,
+  AnyEntity,
+} from '@klerick/json-api-nestjs-shared';
 import { pascalCase } from 'change-case-commonjs';
 
-import { AnyEntity, EntityClass } from '../../../types';
 import { MethodName } from '../types';
 
 import { Bindings } from '../config/bindings';

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/check-item-entity/check-item-entity.pipe.ts

@@ -1,11 +1,10 @@
 import { Inject, NotFoundException, PipeTransform } from '@nestjs/common';
+import { EntityClass, getEntityName } from '@klerick/json-api-nestjs-shared';
+
 import { ValidateQueryError } from '../../../../types';
 import { CURRENT_ENTITY, FIND_ONE_ROW_ENTITY } from '../../../../constants';
-import { EntityClass } from '../../../../types';
 import { FindOneRowEntity } from '../../types';
 
-import { getEntityName } from '@klerick/json-api-nestjs-shared';
-
 export class CheckItemEntityPipe<E extends object, I extends string | number>
   implements PipeTransform<I, Promise<I>>
 {

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/parse-relationship-name/parse-relationship-name.pipe.spec.ts

@@ -1,8 +1,9 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { UnprocessableEntityException } from '@nestjs/common';
+import { EntityClass } from '@klerick/json-api-nestjs-shared';
 import { ParseRelationshipNamePipe } from './parse-relationship-name.pipe';
 import { CURRENT_ENTITY, CHECK_RELATION_NAME } from '../../../../constants';
-import { EntityParam, EntityClass } from '../../../../types';
+import { EntityParam } from '../../../../types';
 
 describe('CheckItemEntityPipe', () => {
   let pipe: ParseRelationshipNamePipe<

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/parse-relationship-name/parse-relationship-name.pipe.ts

@@ -3,14 +3,12 @@ import {
   UnprocessableEntityException,
   Inject,
 } from '@nestjs/common';
+import { EntityClass, getEntityName } from '@klerick/json-api-nestjs-shared';
 
 import { EntityParam, ValidateQueryError } from '../../../../types';
 import { CHECK_RELATION_NAME, CURRENT_ENTITY } from '../../../../constants';
-import { EntityClass } from '../../../../types';
 import { CheckRelationName } from '../../types';
 
-import { getEntityName } from '@klerick/json-api-nestjs-shared';
-
 export class ParseRelationshipNamePipe<
   E extends object,
   I extends keyof EntityParam<E, 'id'>['relationProperty']

libs/json-api/json-api-nestjs/src/lib/modules/mixin/service/entity-param-map.service.ts

@@ -1,7 +1,9 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
+
 import { ENTITY_PARAM_MAP, CURRENT_ENTITY } from '../../../constants';
 import { EntityParamMap } from '../types';
-import { AnyEntity, EntityClass, EntityParam } from '../../../types';
+import { EntityParam } from '../../../types';
 
 @Injectable()
 export class EntityParamMapService<

libs/json-api/json-api-nestjs/src/lib/modules/mixin/service/json-api-transformer.service.ts

@@ -10,10 +10,11 @@ import {
   ResourceObject,
   BaseMainData,
   RelationKeys,
+  EntityClass,
 } from '@klerick/json-api-nestjs-shared';
 import { RoutePathFactory } from '@nestjs/core/router/route-path-factory';
 
-import { EntityParam, EntityClass } from '../../../types';
+import { EntityParam } from '../../../types';
 import { Query, QueryOne } from '../zod';
 import { EntityParamMapService } from './entity-param-map.service';
 

libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/method/delete-one.ts

@@ -1,7 +1,8 @@
 import { Type } from '@nestjs/common';
 import { ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger';
+import { EntityClass } from '@klerick/json-api-nestjs-shared';
 
-import { EntityClass, TypeField } from '../../../../types';
+import { TypeField } from '../../../../types';
 import { errorSchema } from '../utils';
 import { EntityParamMapService } from '../../service';
 

libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/method/delete-relationship.ts

@@ -1,8 +1,9 @@
 import { ApiBody, ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger';
 import { generateSchema } from '@anatine/zod-openapi';
 import { Type } from '@nestjs/common';
+import { EntityClass } from '@klerick/json-api-nestjs-shared';
 
-import { EntityClass, TypeField } from '../../../../types';
+import { TypeField } from '../../../../types';
 import { zodPatchRelationship } from '../../zod';
 import { errorSchema } from '../utils';