Skip to content

fix: select autocomplete to work with return signatures #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adarshsingh87 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: select autocomplete to work with return signatures #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions src/core/Dao.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ export type _QueryDeepPartialEntity<T> = {
| (() => string);
};

export interface QueryOption<
E,
S extends FindOptionsSelect<E> | undefined = undefined,
> {
export interface QueryOption<E, S extends FindOptionsSelect<E> | E = E> {
/**
* Page number
*/
Expand Down Expand Up @@ -87,21 +84,23 @@ export interface QueryOption<

export type ReadManyOption<
E,
S extends FindOptionsSelect<E> | undefined = undefined,
S extends FindOptionsSelect<E> | E = E
> = QueryOption<E, S>;

export type SelectedFields<T, S extends FindOptionsSelect<T> | undefined> =
S extends FindOptionsSelect<T>
? {
[K in keyof S as S[K] extends true ? K : never]: K extends keyof T
? T[K]
: never;
}
: T;
export type SelectedFields<
T,
S extends FindOptionsSelect<T> | T
> = S extends FindOptionsSelect<T>
? {
[K in keyof S as S[K] extends true ? K : never]: K extends keyof T
? T[K]
: never;
}
: T;

export type SelectedRead<
E,
S extends FindOptionsSelect<E> | undefined = undefined,
S extends FindOptionsSelect<E> | E = E
> = S extends undefined ? E : SelectedFields<E, S>;

export type Class<T> =
Expand Down Expand Up @@ -172,7 +171,7 @@ export class Dao<Entity extends BaseEntity> {
* @param manager EntityManager to be used for the operation (optional). Use only for transactions
* @returns Result with the entity
*/
async read<S extends FindOptionsSelect<Entity> | undefined = undefined>(
async read<S extends FindOptionsSelect<Entity> | Entity = Entity>(
value:
| string
| number
Expand All @@ -188,7 +187,7 @@ export class Dao<Entity extends BaseEntity> {
if (typeof value === "number" || typeof value === "string") {
options = { where: { id: value } };
} else {
options = value;
options = value as any;
}
const result = (await repository.findOne(options)) as SelectedRead<
Entity,
Expand Down Expand Up @@ -435,7 +434,7 @@ export class Dao<Entity extends BaseEntity> {
* Read a paginated list of entities
* @returns Result with the list of entities
*/
async readMany<S extends FindOptionsSelect<Entity> | undefined = undefined>(
async readMany<S extends FindOptionsSelect<Entity> | Entity = Entity>(
options?: ReadManyOption<Entity, S>,
manager?: EntityManager
): Promise<WithCount<Result<SelectedRead<Entity, S>[]>>> {
Expand Down Expand Up @@ -484,10 +483,9 @@ export class Dao<Entity extends BaseEntity> {
findOptions["take"] = count;
}

const result = (await repository.find(findOptions)) as SelectedRead<
Entity,
S
>[];
const result = (await repository.find(
findOptions as any
)) as SelectedRead<Entity, S>[];
log.debug("Successfully found", `${this.entityName}/readMany`, {
page,
count,
Expand Down