Skip to content

Commit

Permalink
Upgrade daze to 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
IceMimosa committed May 11, 2020
1 parent 8fd17d2 commit 0577e8a
Show file tree
Hide file tree
Showing 8 changed files with 1,701 additions and 3,494 deletions.
5,153 changes: 1,679 additions & 3,474 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"dependencies": {},
"devDependencies": {
"@dazejs/framework": "^2.7.0",
"@dazejs/framework": "^3.0.0",
"@types/accepts": "^1.3.5",
"@types/cookies": "^0.7.3",
"@types/mysql": "^2.15.8",
Expand All @@ -44,7 +44,8 @@
"ts-jest": "^25.3.1",
"ts-node": "^8.9.1",
"typescript": "^3.8.3",
"glob": "^7.1.3"
"glob": "^7.1.3",
"reflect-metadata": "0.1.13"
},
"peerDependencies": {
"graphql": "^14.6.0",
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/daze/app/author.graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import BookService, { Book } from './service/book.service';
@graphQL('Author')
export default class AuthorGraphql {

@inject(AuthorService)
@inject()
private authorService: AuthorService;
@inject(BookService)
@inject()
private bookService: BookService;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/daze/app/book.graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import BookService, { Book } from './service/book.service';
@graphQL('Book')
export default class BookGraphQL {

@inject(BookService)
@inject()
bookService: BookService;

/**
Expand Down
7 changes: 4 additions & 3 deletions src/__tests__/daze/app/service/author.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Service, Multiton } from '@dazejs/framework/dist';
import { singleton, service } from '@dazejs/framework/dist';

@Multiton()
export default class AuthorService extends Service {
@singleton
@service('authorService')
export default class AuthorService {

private authors: Map<number, Author> = new Map();

Expand Down
7 changes: 4 additions & 3 deletions src/__tests__/daze/app/service/book.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Service, Multiton } from '@dazejs/framework/dist';
import { service, singleton } from '@dazejs/framework/dist';

@Multiton()
export default class BookService extends Service {
@singleton
@service('bookService')
export default class BookService {

private books: Map<number, Book> = new Map();

Expand Down
7 changes: 4 additions & 3 deletions src/core/graphql.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Middleware, Request, Response, TNext } from "@dazejs/framework";
import { execute, getOperationAST, parse, Source, specifiedRules, validate } from 'graphql';
import { GraphqlConfig } from './graphql.config';
import { GraphqlAnalyzer } from './graphql.analyzer';
import { order } from '@dazejs/framework/dist/decorators/order';
import { BaseMiddleware, middleware, Next, Request, Response } from '@dazejs/framework/dist';

@order(Number.MAX_SAFE_INTEGER + 1)
export default class GraphQLMiddleware extends Middleware {
@middleware()
export default class GraphQLMiddleware extends BaseMiddleware {
private readonly graphqlConfig: GraphqlConfig;
private readonly analyzer: GraphqlAnalyzer;

Expand All @@ -15,7 +16,7 @@ export default class GraphQLMiddleware extends Middleware {
this.analyzer = new GraphqlAnalyzer(this.app).analyze();
}

async resolve(request: Request | any, next: TNext): Promise<Response> {
async resolve(request: Request | any, next: Next): Promise<Response> {
if (!this.isGraphQLRequest(request)) {
return next();
}
Expand Down
10 changes: 4 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { Provider } from '@dazejs/framework/dist';
import { Config } from '@dazejs/framework/dist/decorators';
import { Depend } from '@dazejs/framework/dist/decorators/provider';
import { BaseProvider, conf, provider } from '@dazejs/framework/dist';
import GraphQLMiddleware from './core/graphql.middleware';
import { GraphqlConfig } from './core/graphql.config';

@Depend()
export class GraphQLProvider extends Provider {
@provider()
export class GraphQLProvider extends BaseProvider {

@Config('app.graphql')
@conf('app.graphql')
private conf: any;

launch(): void | Promise<void> {
Expand Down

0 comments on commit 0577e8a

Please sign in to comment.