feat(medusa): Update BuildQuery typings (#1672)

This commit is contained in:
Adrien de Peretti
2022-06-17 10:03:51 +02:00
committed by GitHub
parent 453688682c
commit 93aaaa71bd
2 changed files with 13 additions and 10 deletions
+12 -6
View File
@@ -7,7 +7,12 @@ import {
IsString, IsString,
} from "class-validator" } from "class-validator"
import "reflect-metadata" import "reflect-metadata"
import { FindManyOptions, FindOperator, OrderByCondition } from "typeorm" import {
FindManyOptions,
FindOneOptions,
FindOperator,
OrderByCondition,
} from "typeorm"
import { transformDate } from "../utils/validators/date-transform" import { transformDate } from "../utils/validators/date-transform"
import { BaseEntity } from "../interfaces/models/base-entity" import { BaseEntity } from "../interfaces/models/base-entity"
@@ -31,11 +36,12 @@ export type Writable<T> = {
| FindOperator<string[]> | FindOperator<string[]>
} }
export type ExtendedFindConfig<TEntity> = FindConfig<TEntity> & { export type ExtendedFindConfig<TEntity> = FindConfig<TEntity> &
where: Partial<Writable<TEntity>> (FindOneOptions<TEntity> | FindManyOptions<TEntity>) & {
withDeleted?: boolean where: Partial<Writable<TEntity>>
relations?: string[] withDeleted?: boolean
} relations?: string[]
}
export type Selector<TEntity> = { export type Selector<TEntity> = {
[key in keyof TEntity]?: [key in keyof TEntity]?:
+1 -4
View File
@@ -78,10 +78,7 @@ export function buildQuery<TEntity = unknown>(
}, {} as Partial<Writable<TEntity>>) }, {} as Partial<Writable<TEntity>>)
} }
const query: FindConfig<TEntity> & { const query: ExtendedFindConfig<TEntity> = {
where: Partial<Writable<TEntity>>
withDeleted?: boolean
} = {
where: build(selector), where: build(selector),
} }