Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
942 changes: 942 additions & 0 deletions .yarn/releases/yarn-4.12.0.cjs

Large diffs are not rendered by default.

925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.4.0.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.4.0.cjs
yarnPath: .yarn/releases/yarn-4.12.0.cjs
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
},
"dependencies": {
"@m8a/nestjs-typegoose": "12.0.1",
"@nestjs/common": "11.1.6",
"@nestjs/core": "11.1.6",
"@nestjs/common": "11.1.9",
"@nestjs/core": "11.1.9",
"@nestjs/graphql": "^13.2.0",
"@nestjs/jwt": "11.0.0",
"@nestjs/jwt": "11.0.1",
"@nestjs/mongoose": "11.0.3",
"@nestjs/passport": "11.0.5",
"@nestjs/platform-express": "11.1.6",
"@nestjs/sequelize": "11.0.0",
"@nestjs/platform-express": "11.1.9",
"@nestjs/sequelize": "11.0.1",
"@nestjs/typeorm": "^11.0.0",
"class-validator": "0.14.1",
"mongoose": "8.10.1",
"mongoose": "8.20.1",
"reflect-metadata": "^0.2.2",
"sequelize": "6.37.7",
"sequelize-typescript": "2.1.6",
Expand All @@ -36,27 +36,27 @@
"devDependencies": {
"@actions/core": "^1.11.1",
"@apollo/federation": "0.38.1",
"@apollo/gateway": "2.11.2",
"@apollo/gateway": "2.12.1",
"@apollo/server": "^4.11.3",
"@apollo/subgraph": "2.11.2",
"@apollo/subgraph": "2.12.1",
"@as-integrations/express5": "^1.1.2",
"@commitlint/cli": "19.7.1",
"@commitlint/config-conventional": "^19.7.1",
"@docusaurus/core": "3.9.1",
"@docusaurus/module-type-aliases": "3.9.1",
"@docusaurus/preset-classic": "3.9.1",
"@docusaurus/core": "3.9.2",
"@docusaurus/module-type-aliases": "3.9.2",
"@docusaurus/preset-classic": "3.9.2",
"@jscutlery/semver": "5.7.1",
"@nestjs/apollo": "^13.2.1",
"@nestjs/cli": "11.0.10",
"@nestjs/schematics": "11.0.8",
"@nestjs/testing": "^11.1.6",
"@nestjs/cli": "11.0.12",
"@nestjs/schematics": "11.0.9",
"@nestjs/testing": "^11.1.9",
"@nx-extend/docusaurus": "^2.0.1",
"@nx/eslint": "19.6.1",
"@nx/eslint-plugin": "19.6.1",
"@nx/jest": "19.6.1",
"@nx/js": "19.6.1",
"@nx/node": "19.6.1",
"@typegoose/typegoose": "12.11.0",
"@typegoose/typegoose": "12.20.0",
"@types/express": "4.17.21",
"@types/jest": "29.5.14",
"@types/lodash.escaperegexp": "4.1.9",
Expand Down Expand Up @@ -87,27 +87,27 @@
"eslint-plugin-prettier": "5.5.4",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-tsdoc": "0.2.17",
"graphql": "16.11.0",
"graphql": "16.12.0",
"graphql-query-complexity": "1.1.0",
"graphql-subscriptions": "^3.0.0",
"graphql-tools": "9.0.20",
"graphql-tools": "9.0.24",
"husky": "9.1.7",
"jest": "29.7.0",
"jest-extended": "4.0.2",
"mongodb-memory-server": "9.3.0",
"mysql2": "3.15.1",
"mysql2": "3.15.3",
"nx": "19.6.1",
"passport": "0.7.0",
"passport-jwt": "4.0.1",
"passport-local": "1.0.0",
"pg": "8.16.3",
"prettier": "3.6.2",
"prettier": "3.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sql-formatter": "^15.6.10",
"sqlite3": "^5.1.7",
"supertest": "7.1.4",
"ts-jest": "29.4.4",
"ts-jest": "29.4.5",
"ts-loader": "9.5.4",
"ts-mockito": "2.6.1",
"ts-morph": "^22.0.0",
Expand All @@ -116,5 +116,5 @@
"tsconfig-paths": "4.2.0",
"typescript": "^5.9.3"
},
"packageManager": "yarn@4.4.0"
"packageManager": "yarn@4.12.0"
}
11 changes: 8 additions & 3 deletions packages/core/src/assemblers/abstract.assembler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ import { Assembler, getAssemblerClasses } from './assembler'
* * convertQuery
*
*/
export abstract class AbstractAssembler<DTO, Entity, C = DeepPartial<DTO>, CE = DeepPartial<Entity>, U = C, UE = CE>
implements Assembler<DTO, Entity, C, CE, U, UE>
{
export abstract class AbstractAssembler<
DTO,
Entity,
C = DeepPartial<DTO>,
CE = DeepPartial<Entity>,
U = C,
UE = CE
> implements Assembler<DTO, Entity, C, CE, U, UE> {
readonly DTOClass: Class<DTO>

readonly EntityClass: Class<Entity>
Expand Down
11 changes: 8 additions & 3 deletions packages/core/src/services/assembler-query.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ import {
} from '../interfaces'
import { QueryService } from './query.service'

export class AssemblerQueryService<DTO, Entity, C = DeepPartial<DTO>, CE = DeepPartial<Entity>, U = C, UE = CE>
implements QueryService<DTO, C, U>
{
export class AssemblerQueryService<
DTO,
Entity,
C = DeepPartial<DTO>,
CE = DeepPartial<Entity>,
U = C,
UE = CE
> implements QueryService<DTO, C, U> {
constructor(
readonly assembler: Assembler<DTO, Entity, C, CE, U, UE>,
readonly queryService: QueryService<Entity, CE, UE>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ type AggregateRelationsArgs<DTO, Relation> = {
}
type AggregateRelationsMap<DTO, Relation> = Map<string, (AggregateRelationsArgs<DTO, Relation> & { index: number })[]>

export class AggregateRelationsLoader<DTO, Relation>
implements NestjsQueryDataloader<DTO, AggregateRelationsArgs<DTO, Relation>, AggregateResponse<Relation> | Error>
{
export class AggregateRelationsLoader<DTO, Relation> implements NestjsQueryDataloader<
DTO,
AggregateRelationsArgs<DTO, Relation>,
AggregateResponse<Relation> | Error
> {
constructor(
readonly RelationDTO: Class<Relation>,
readonly relationName: string
Expand Down
8 changes: 5 additions & 3 deletions packages/query-graphql/src/loader/count-relations.loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import { NestjsQueryDataloader } from './relations.loader'
type CountRelationsArgs<DTO, Relation> = { dto: DTO; filter: Filter<Relation> }
type CountRelationsMap<DTO, Relation> = Map<string, (CountRelationsArgs<DTO, Relation> & { index: number })[]>

export class CountRelationsLoader<DTO, Relation>
implements NestjsQueryDataloader<DTO, CountRelationsArgs<DTO, Relation>, number | Error>
{
export class CountRelationsLoader<DTO, Relation> implements NestjsQueryDataloader<
DTO,
CountRelationsArgs<DTO, Relation>,
number | Error
> {
constructor(
readonly RelationDTO: Class<Relation>,
readonly relationName: string
Expand Down
8 changes: 5 additions & 3 deletions packages/query-graphql/src/loader/find-relations.loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ export type FindRelationsArgs<DTO, Relation> = { dto: DTO } & FindRelationOption
type FindRelationsOpts<Relation> = Omit<FindRelationOptions<Relation>, 'filter'>
type FindRelationsMap<DTO, Relation> = Map<string, (FindRelationsArgs<DTO, Relation> & { index: number })[]>

export class FindRelationsLoader<DTO, Relation>
implements NestjsQueryDataloader<DTO, FindRelationsArgs<DTO, Relation>, Relation | undefined | Error>
{
export class FindRelationsLoader<DTO, Relation> implements NestjsQueryDataloader<
DTO,
FindRelationsArgs<DTO, Relation>,
Relation | undefined | Error
> {
constructor(
readonly RelationDTO: Class<Relation>,
readonly relationName: string
Expand Down
8 changes: 5 additions & 3 deletions packages/query-graphql/src/loader/query-relations.loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import { NestjsQueryDataloader } from './relations.loader'
type QueryRelationsArgs<DTO, Relation> = { dto: DTO; query: Query<Relation> }
type QueryRelationsMap<DTO, Relation> = Map<string, (QueryRelationsArgs<DTO, Relation> & { index: number })[]>

export class QueryRelationsLoader<DTO, Relation>
implements NestjsQueryDataloader<DTO, QueryRelationsArgs<DTO, Relation>, Relation[] | Error>
{
export class QueryRelationsLoader<DTO, Relation> implements NestjsQueryDataloader<
DTO,
QueryRelationsArgs<DTO, Relation>,
Relation[] | Error
> {
constructor(
readonly RelationDTO: Class<Relation>,
readonly relationName: string
Expand Down
8 changes: 5 additions & 3 deletions packages/query-graphql/src/resolvers/crud.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export interface CRUDResolverOpts<
U = DeepPartial<DTO>,
R extends ReadResolverOpts<DTO> = ReadResolverOpts<DTO>,
PS extends PagingStrategies = PagingStrategies.CURSOR
> extends BaseResolverOptions,
Pick<ConnectionOptions, 'enableTotalCount'> {
>
extends BaseResolverOptions, Pick<ConnectionOptions, 'enableTotalCount'> {
/**
* The DTO that should be used as input for create endpoints.
*/
Expand Down Expand Up @@ -50,7 +50,9 @@ export interface CRUDResolver<
U,
R extends ReadResolverOpts<DTO>,
QS extends QueryService<DTO, C, U> = QueryService<DTO, C, U>
> extends CreateResolver<DTO, C, QS>,
>
extends
CreateResolver<DTO, C, QS>,
ReadResolverFromOpts<DTO, R, QS>,
UpdateResolver<DTO, U, QS>,
DeleteResolver<DTO, QS>,
Expand Down
7 changes: 5 additions & 2 deletions packages/query-graphql/src/resolvers/read.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ export type ReadResolverOpts<DTO> = {
QueryArgsTypeOpts<DTO> &
Pick<ConnectionOptions, 'enableTotalCount'>

export interface ReadResolver<DTO, PS extends PagingStrategies, QS extends QueryService<DTO, unknown, unknown>>
extends ServiceResolver<DTO, QS> {
export interface ReadResolver<
DTO,
PS extends PagingStrategies,
QS extends QueryService<DTO, unknown, unknown>
> extends ServiceResolver<DTO, QS> {
queryMany(
query: QueryType<DTO, PagingStrategies>,
authorizeFilter?: Filter<DTO>,
Expand Down
Loading
Loading