-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
22 changed files
with
139 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
export { QueryService } from './query.service'; | ||
export { QueryService, getQueryServiceToken } from './query.service'; | ||
export { AssemblerQueryService } from './assembler-query.service'; | ||
export { RelationQueryService, QueryServiceRelation } from './relation-query.service'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import { ObjectType } from '@nestjs/graphql'; | ||
import { NestjsQueryGraphQLModule } from '../src'; | ||
import { FilterableField } from '../src/decorators/filterable-field.decorator'; | ||
|
||
describe('NestjsQueryTypeOrmModule', () => { | ||
@ObjectType() | ||
class TestDTO { | ||
@FilterableField() | ||
name!: string; | ||
} | ||
|
||
it('should create a module', () => { | ||
const typeOrmModule = NestjsQueryGraphQLModule.forFeature({ | ||
imports: [], | ||
resolvers: [ | ||
{ | ||
DTOClass: TestDTO, | ||
EntityClass: TestDTO, | ||
}, | ||
], | ||
}); | ||
expect(typeOrmModule.imports).toHaveLength(0); | ||
expect(typeOrmModule.module).toBe(NestjsQueryGraphQLModule); | ||
expect(typeOrmModule.providers).toHaveLength(1); | ||
expect(typeOrmModule.exports).toHaveLength(1); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { Class } from '@nestjs-query/core'; | ||
import { NoOpQueryService } from '@nestjs-query/core/src/services/noop-query.service'; | ||
import { ObjectType } from '@nestjs/graphql'; | ||
import { FilterableField } from '../src/decorators'; | ||
import { createResolvers } from '../src/providers'; | ||
import { CRUDResolver } from '../src/resolvers'; | ||
|
||
describe('createTypeOrmQueryServiceProviders', () => { | ||
@ObjectType() | ||
class TestDTO { | ||
@FilterableField() | ||
name!: string; | ||
} | ||
|
||
it('should create a provider for the entity', () => { | ||
const providers = createResolvers([{ DTOClass: TestDTO, EntityClass: TestDTO }]); | ||
expect(providers).toHaveLength(1); | ||
const Provider = providers[0] as Class<CRUDResolver<TestDTO, TestDTO, TestDTO>>; | ||
expect(Provider.name).toBe('TestDTOAutoResolver'); | ||
expect(new Provider(NoOpQueryService.getInstance())).toBeInstanceOf(Provider); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { DynamicModule } from '@nestjs/common'; | ||
import { AutoResolverOpts, createResolvers } from './providers'; | ||
|
||
export interface NestjsQueryGraphqlModuleOpts { | ||
imports: DynamicModule[]; | ||
resolvers: AutoResolverOpts<unknown, unknown>[]; | ||
} | ||
|
||
export class NestjsQueryGraphQLModule { | ||
static forFeature(opts: NestjsQueryGraphqlModuleOpts): DynamicModule { | ||
const resolverProviders = createResolvers(opts.resolvers); | ||
return { | ||
module: NestjsQueryGraphQLModule, | ||
imports: [...opts.imports], | ||
providers: [...resolverProviders], | ||
exports: [...resolverProviders, ...opts.imports], | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import { Class, QueryService, getQueryServiceToken, AssemblerQueryService, AssemblerFactory } from '@nestjs-query/core'; | ||
import { Provider, Inject } from '@nestjs/common'; | ||
import { Resolver } from '@nestjs/graphql'; | ||
import { CRUDResolver, CRUDResolverOpts } from './resolvers'; | ||
|
||
export interface AutoResolverOpts<DTO, Entity> extends CRUDResolverOpts<DTO> { | ||
DTOClass: Class<DTO>; | ||
EntityClass: Class<Entity>; | ||
} | ||
|
||
const getResolverToken = <DTO>(DTOClass: Class<DTO>): string => `${DTOClass.name}AutoResolver`; | ||
|
||
function createResolver<DTO, Entity>(resolverOpts: AutoResolverOpts<DTO, Entity>): Provider { | ||
const { DTOClass, EntityClass } = resolverOpts; | ||
|
||
class Service extends AssemblerQueryService<DTO, Entity> { | ||
constructor(service: QueryService<Entity>) { | ||
const assembler = AssemblerFactory.getAssembler(DTOClass, EntityClass); | ||
super(assembler, service); | ||
} | ||
} | ||
|
||
@Resolver(() => DTOClass) | ||
class AutoResolver extends CRUDResolver(DTOClass, resolverOpts) { | ||
constructor(@Inject(getQueryServiceToken(resolverOpts.EntityClass)) service: QueryService<Entity>) { | ||
super(new Service(service)); | ||
} | ||
} | ||
// need to set class name so DI works properly | ||
Object.defineProperty(AutoResolver, 'name', { value: getResolverToken(DTOClass), writable: false }); | ||
|
||
return AutoResolver; | ||
} | ||
|
||
export const createResolvers = (opts: AutoResolverOpts<unknown, unknown>[]): Provider[] => { | ||
return opts.map((opt) => createResolver(opt)); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
export { InjectSequelizeQueryService } from './inject-sequelize-query-service.decorator'; | ||
export { getSequelizeQueryServiceKey } from './decorators.utils'; |
4 changes: 2 additions & 2 deletions
4
packages/query-sequelize/src/decorators/inject-sequelize-query-service.decorator.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
import { getQueryServiceToken } from '@nestjs-query/core'; | ||
import { Inject } from '@nestjs/common'; | ||
import { Model, ModelCtor } from 'sequelize-typescript'; | ||
import { getSequelizeQueryServiceKey } from './decorators.utils'; | ||
|
||
export const InjectSequelizeQueryService = <Entity extends Model<Entity>>( | ||
entity: ModelCtor<Entity>, | ||
): ParameterDecorator => Inject(getSequelizeQueryServiceKey(entity)); | ||
): ParameterDecorator => Inject(getQueryServiceToken(entity)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
export { SequelizeQueryService } from './services'; | ||
export { InjectSequelizeQueryService, getSequelizeQueryServiceKey } from './decorators'; | ||
export { InjectSequelizeQueryService } from './decorators'; | ||
export { NestjsQuerySequelizeModule } from './module'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
export { InjectTypeOrmQueryService } from './inject-typeorm-query-service.decorator'; | ||
export { getTypeOrmQueryServiceKey } from './decorators.utils'; |
5 changes: 2 additions & 3 deletions
5
packages/query-typeorm/src/decorators/inject-typeorm-query-service.decorator.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
import { Class } from '@nestjs-query/core'; | ||
import { Class, getQueryServiceToken } from '@nestjs-query/core'; | ||
import { Inject } from '@nestjs/common'; | ||
import { getTypeOrmQueryServiceKey } from './decorators.utils'; | ||
|
||
export const InjectTypeOrmQueryService = <Entity>(entity: Class<Entity>): ParameterDecorator => | ||
Inject(getTypeOrmQueryServiceKey(entity)); | ||
Inject(getQueryServiceToken(entity)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
export { TypeOrmQueryService, TypeOrmQueryServiceOpts } from './services'; | ||
export { InjectTypeOrmQueryService, getTypeOrmQueryServiceKey } from './decorators'; | ||
export { InjectTypeOrmQueryService } from './decorators'; | ||
export { NestjsQueryTypeOrmModule } from './module'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters