Skip to content

Commit 01a36d7

Browse files
committed
fix(json-api-server): fix type in some place
1 parent 2425fb6 commit 01a36d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+108
-100
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export {
1010
UnionToTuple,
1111
EntityParam,
1212
TypeField,
13-
ObjectLiteral,
1413
} from './lib/types';
1514
export {
1615
JsonApiTransformerService,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
NestModule,
88
} from '@nestjs/common';
99
import { DiscoveryModule, RouterModule } from '@nestjs/core';
10+
import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
1011

1112
import { OperationController } from './controllers';
1213
import { ExplorerService, ExecuteService, SwaggerService } from './service';
@@ -17,7 +18,6 @@ import {
1718
ZodInputOperation,
1819
AsyncIterate,
1920
} from './factory';
20-
import { AnyEntity, EntityClass } from '../../types';
2121
import { MAP_CONTROLLER_INTERCEPTORS } from './constants';
2222

2323
@Module({})

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ export const MAP_CONTROLLER_INTERCEPTORS = Symbol(
55
export const MAP_ENTITY = Symbol('MAP_ENTITY');
66
export const ZOD_INPUT_OPERATION = Symbol('ZOD_INPUT_OPERATION');
77
export const ASYNC_ITERATOR_FACTORY = Symbol('ASYNC_ITERATOR_FACTORY');
8-
export const KEY_MAIN_INPUT_SCHEMA = 'atomic:operations';
9-
export const KEY_MAIN_OUTPUT_SCHEMA = 'atomic:results';

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ import { Test, TestingModule } from '@nestjs/testing';
22
import { DiscoveryModule } from '@nestjs/core';
33
import { HttpException } from '@nestjs/common';
44
import { Module } from '@nestjs/core/injector/module';
5+
import {
6+
KEY_MAIN_OUTPUT_SCHEMA,
7+
Operation,
8+
} from '@klerick/json-api-nestjs-shared';
59

610
import { OperationController } from './operation.controller';
711
import { ExecuteService, ExplorerService } from '../service';
8-
import { InputArray, Operation } from '../utils';
9-
import { JsonBaseController } from '../../mixin/controllers/json-base.controller';
12+
import { InputArray } from '../utils';
13+
import { JsonBaseController } from '../../mixin/controllers';
1014

1115
import { Users } from '../../../utils/___test___/test-classes.helper';
1216

1317
import {
1418
ASYNC_ITERATOR_FACTORY,
15-
KEY_MAIN_OUTPUT_SCHEMA,
1619
MAP_CONTROLLER_ENTITY,
1720
MAP_ENTITY,
1821
ZOD_INPUT_OPERATION,
@@ -21,7 +24,6 @@ import {
2124

2225
import { OperationMethode } from '../types';
2326
import { AsyncLocalStorage } from 'async_hooks';
24-
import { ObjectLiteral } from '../../../types';
2527
import { RUN_IN_TRANSACTION_FUNCTION } from '../../../constants';
2628

2729
describe('OperationController', () => {
@@ -106,7 +108,7 @@ describe('OperationController', () => {
106108
const getMethodNameByParamSpy = jest
107109
.spyOn(explorerService, 'getMethodNameByParam')
108110
.mockReturnValue(
109-
paramsForExecuteMock[0].methodName as OperationMethode<ObjectLiteral>
111+
paramsForExecuteMock[0].methodName as OperationMethode<object>
110112
);
111113
const getModulesByControllerSpy = jest
112114
.spyOn(explorerService, 'getParamsForMethod')

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ import {
88
Type,
99
} from '@nestjs/common';
1010
import { Module } from '@nestjs/core/injector/module';
11-
11+
import {
12+
KEY_MAIN_INPUT_SCHEMA,
13+
KEY_MAIN_OUTPUT_SCHEMA,
14+
} from '@klerick/json-api-nestjs-shared';
1215
import { InputArray } from '../utils';
1316
import { InputOperationPipe } from '../pipes/input-operation.pipe';
1417
import { ExecuteService, ExplorerService } from '../service';
15-
import { KEY_MAIN_INPUT_SCHEMA, KEY_MAIN_OUTPUT_SCHEMA } from '../constants';
1618
import { OperationMethode, ParamsForExecute } from '../types';
1719
import { JsonBaseController } from '../../mixin/controllers/json-base.controller';
1820
import { ValidateQueryError } from '../../../types';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DynamicModule, ValueProvider } from '@nestjs/common';
22
import { Type } from '@nestjs/common/interfaces/type.interface';
3-
import { EntityClass, AnyEntity } from '../../../types';
3+
import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
44
import { MapController } from '../types';
55
import { MAP_CONTROLLER_ENTITY } from '../constants';
66

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { ValueProvider } from '@nestjs/common';
2+
import {
3+
getEntityName,
4+
AnyEntity,
5+
EntityClass,
6+
} from '@klerick/json-api-nestjs-shared';
27
import { kebabCase } from 'change-case-commonjs';
38
import { MapEntity } from '../types';
49
import { MAP_ENTITY } from '../constants';
5-
import { AnyEntity, EntityClass } from '../../../types';
6-
7-
import { getEntityName } from '@klerick/json-api-nestjs-shared';
810

911
export function MapEntityNameToEntity(
1012
entities: EntityClass<AnyEntity>[]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { FactoryProvider } from '@nestjs/common';
2+
import { AnyEntity, EntityClass } from '@klerick/json-api-nestjs-shared';
23
import { MAP_CONTROLLER_ENTITY, ZOD_INPUT_OPERATION } from '../constants';
34
import { MapController } from '../types';
45
import { zodInputOperation, ZodInputOperation } from '../utils';
56
import { ENTITY_PARAM_MAP } from '../../../constants';
67
import { EntityParamMap } from '../../mixin/types';
7-
import { AnyEntity, EntityClass, ObjectLiteral } from '../../../types';
88

9-
export function ZodInputOperation<E extends ObjectLiteral>(): FactoryProvider<
9+
export function ZodInputOperation<E extends object>(): FactoryProvider<
1010
ZodInputOperation<E>
1111
> {
1212
return {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Test, TestingModule } from '@nestjs/testing';
2+
import { KEY_MAIN_INPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
23
import { ZodError } from 'zod';
34
import {
45
InternalServerErrorException,
@@ -7,7 +8,7 @@ import {
78

89
import { InputOperationPipe } from './input-operation.pipe';
910

10-
import { KEY_MAIN_INPUT_SCHEMA, ZOD_INPUT_OPERATION } from '../constants';
11+
import { ZOD_INPUT_OPERATION } from '../constants';
1112
import { ZodInputOperation } from '../utils';
1213

1314
describe('PatchInputPipe', () => {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import {
44
Inject,
55
PipeTransform,
66
} from '@nestjs/common';
7+
import { KEY_MAIN_INPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
78
import { errorMap } from 'zod-validation-error';
89
import { ZodError } from 'zod';
910
import { JSONValue } from '../../mixin/types';
1011
import { InputArray, ZodInputOperation } from '../utils';
11-
import { KEY_MAIN_INPUT_SCHEMA, ZOD_INPUT_OPERATION } from '../constants';
12+
import { ZOD_INPUT_OPERATION } from '../constants';
1213

1314
export class InputOperationPipe
1415
implements PipeTransform<JSONValue, InputArray>

0 commit comments

Comments
 (0)