Skip to content

Commit 0c71ac4

Browse files
author
hirsch88
committed
Merge develop
2 parents 54397b6 + c4c269c commit 0c71ac4

15 files changed

+109
-162
lines changed

‎.env.example

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ DB_LOGGING=false
3535
#
3636
GRAPHQL_ENABLED=true
3737
GRAPHQL_ROUTE="/graphql"
38+
GRAPHQL_EDITOR=true
3839

3940
#
4041
# Swagger

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ test/**/*.js
3434
test/**/*.js.map
3535
coverage/
3636
!test/preprocessor.js
37+
mydb.sql

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ The swagger and the monitor route can be altered in the `.env` file.
215215
| .env.example | Environment configurations |
216216
| .env.test | Test environment configurations |
217217
| ormconfig.json | TypeORM configuration for the database. Used by seeds and the migration. (generated file) |
218+
| mydb.sql | SQLite database for integration tests. Ignored by git and only available after integration tests |
218219

219220
## Logging
220221

‎mydb.sql

-28 KB
Binary file not shown.

‎package-scripts.js

+81-140
Original file line numberDiff line numberDiff line change
@@ -6,190 +6,131 @@ const { series, crossEnv, concurrent, rimraf, runInNewWindow } = require('nps-ut
66

77
module.exports = {
88
scripts: {
9-
default: {
10-
script: 'nps start'
11-
},
9+
default: 'nps start',
1210
/**
1311
* Starts the builded app from the dist directory
1412
*/
15-
start: {
16-
script: 'node dist/app.js'
17-
},
13+
start: 'node dist/app.js',
1814
/**
1915
* Serves the current app and watches for changes to restart it
2016
*/
21-
serve: {
22-
script: series(
23-
'nps banner.serve',
24-
'nodemon --watch src --watch .env'
25-
)
26-
},
17+
serve: series(
18+
'nps banner.serve',
19+
'nodemon --watch src --watch .env'
20+
),
2721
/**
2822
* Setup's the development environment and the database
2923
*/
30-
setup: {
31-
script: series(
32-
'yarn install',
33-
'nps db.migrate',
34-
'nps db.seed'
35-
)
36-
},
24+
setup: series(
25+
'yarn install',
26+
'nps db.migrate',
27+
'nps db.seed'
28+
),
3729
/**
3830
* Builds the app into the dist directory
3931
*/
40-
build: {
41-
script: series(
42-
'nps banner.build',
43-
'nps lint',
44-
'nps clean.dist',
45-
'nps transpile',
46-
'nps copy'
47-
)
48-
},
32+
build: series(
33+
'nps banner.build',
34+
'nps lint',
35+
'nps clean.dist',
36+
'nps transpile',
37+
'nps copy'
38+
),
4939
/**
5040
* Database scripts
5141
*/
5242
db: {
53-
migrate: {
54-
script: series(
55-
'nps banner.migrate',
56-
'nps db.config',
57-
runFast('./node_modules/typeorm/cli.js migrations:run')
58-
)
59-
},
60-
revert: {
61-
script: series(
62-
'nps banner.revert',
63-
'nps db.config',
64-
runFast('./node_modules/typeorm/cli.js migrations:revert')
65-
)
66-
},
67-
seed: {
68-
script: series(
69-
'nps banner.seed',
70-
'nps db.config',
71-
runFast('./src/lib/seeds/')
72-
)
73-
},
74-
config: {
75-
script: runFast('./src/lib/ormconfig.ts')
76-
},
77-
drop: {
78-
script: runFast('./node_modules/typeorm/cli.js schema:drop')
79-
}
43+
migrate: series(
44+
'nps banner.migrate',
45+
'nps db.config',
46+
runFast('./node_modules/typeorm/cli.js migrations:run')
47+
),
48+
revert: series(
49+
'nps banner.revert',
50+
'nps db.config',
51+
runFast('./node_modules/typeorm/cli.js migrations:revert')
52+
),
53+
seed: series(
54+
'nps banner.seed',
55+
'nps db.config',
56+
runFast('./src/lib/seeds/')
57+
),
58+
config: runFast('./src/lib/ormconfig.ts'),
59+
drop: runFast('./node_modules/typeorm/cli.js schema:drop')
8060
},
8161
/**
8262
* These run various kinds of tests. Default is unit.
8363
*/
8464
test: {
8565
default: 'nps test.unit',
8666
unit: {
87-
default: {
88-
script: series(
89-
'nps banner.test',
90-
'nps test.unit.pretest',
91-
'nps test.unit.run'
92-
)
93-
},
94-
pretest: {
95-
script: 'tslint -c ./tslint.json -t stylish ./test/unit/**/*.ts'
96-
},
97-
run: {
98-
script: 'cross-env NODE_ENV=test jest --testPathPattern=unit'
99-
},
100-
verbose: {
101-
script: 'nps "test --verbose"'
102-
},
103-
coverage: {
104-
script: 'nps "test --coverage"'
105-
}
67+
default: series(
68+
'nps banner.test',
69+
'nps test.unit.pretest',
70+
'nps test.unit.run'
71+
),
72+
pretest: 'tslint -c ./tslint.json -t stylish ./test/unit/**/*.ts',
73+
run: 'cross-env NODE_ENV=test jest --testPathPattern=unit',
74+
verbose: 'nps "test --verbose"',
75+
coverage: 'nps "test --coverage"'
10676
},
10777
integration: {
108-
default: {
109-
script: series(
110-
'nps banner.test',
111-
'nps test.integration.pretest',
112-
'nps test.integration.run'
113-
)
114-
},
115-
pretest: {
116-
script: 'tslint -c ./tslint.json -t stylish ./test/integration/**/*.ts'
117-
},
118-
verbose: {
119-
script: 'nps "test.integration --verbose"'
120-
},
121-
run: {
122-
// -i. Run all tests serially in the current process, rather than creating a worker pool of child processes that run tests. This can be useful for debugging.
123-
script: 'cross-env NODE_ENV=test jest --testPathPattern=integration -i'
124-
},
78+
default: series(
79+
'nps banner.test',
80+
'nps test.integration.pretest',
81+
'nps test.integration.run'
82+
),
83+
pretest: 'tslint -c ./tslint.json -t stylish ./test/integration/**/*.ts',
84+
verbose: 'nps "test.integration --verbose"',
85+
// -i. Run all tests serially in the current process, rather than creating a worker pool of child processes that run tests. This can be useful for debugging.
86+
run: 'cross-env NODE_ENV=test jest --testPathPattern=integration -i',
12587
},
12688
e2e: {
127-
default: {
128-
script: series(
129-
'nps banner.test',
130-
'nps test.e2e.pretest',
131-
'nps test.e2e.run'
132-
)
133-
},
134-
pretest: {
135-
script: 'tslint -c ./tslint.json -t stylish ./test/e2e/**/*.ts'
136-
},
137-
verbose: {
138-
script: 'nps "test.e2e --verbose"'
139-
},run: {
140-
// -i. Run all tests serially in the current process, rather than creating a worker pool of child processes that run tests. This can be useful for debugging.
141-
script: 'cross-env NODE_ENV=test jest --testPathPattern=e2e -i'
142-
},
89+
default: series(
90+
'nps banner.test',
91+
'nps test.e2e.pretest',
92+
'nps test.e2e.run'
93+
),
94+
pretest: 'tslint -c ./tslint.json -t stylish ./test/e2e/**/*.ts',
95+
verbose: 'nps "test.e2e --verbose"',
96+
// -i. Run all tests serially in the current process, rather than creating a worker pool of child processes that run tests. This can be useful for debugging.
97+
run: 'cross-env NODE_ENV=test jest --testPathPattern=e2e -i',
14398
}
14499
},
145100
/**
146101
* Runs TSLint over your project
147102
*/
148-
lint: {
149-
script: `tslint -c ./tslint.json -p tsconfig.json src/**/*.ts --format stylish`
150-
},
103+
lint: `tslint -c ./tslint.json -p tsconfig.json src/**/*.ts --format stylish`,
151104
/**
152105
* Transpile your app into javascript
153106
*/
154-
transpile: {
155-
script: `tsc`
156-
},
107+
transpile: `tsc`,
157108
/**
158109
* Clean files and folders
159110
*/
160111
clean: {
161-
default: {
162-
script: series(
163-
`nps banner.clean`,
164-
`nps clean.dist`
165-
)
166-
},
167-
dist: {
168-
script: rimraf('./dist')
169-
}
112+
default: series(
113+
`nps banner.clean`,
114+
`nps clean.dist`
115+
),
116+
dist: rimraf('./dist')
170117
},
171118
/**
172119
* Copies static files to the build folder
173120
*/
174121
copy: {
175-
default: {
176-
script: series(
177-
`nps copy.swagger`,
178-
`nps copy.public`
179-
)
180-
},
181-
swagger: {
182-
script: copy(
183-
'./src/api/swagger.json',
184-
'./dist'
185-
)
186-
},
187-
public: {
188-
script: copy(
189-
'./src/public/*',
190-
'./dist'
191-
)
192-
}
122+
default: series(
123+
`nps copy.swagger`,
124+
`nps copy.public`
125+
),
126+
swagger: copy(
127+
'./src/api/swagger.json',
128+
'./dist'
129+
),
130+
public: copy(
131+
'./src/public/*',
132+
'./dist'
133+
)
193134
},
194135
/**
195136
* This creates pretty banner to the terminal

‎src/api/types/PetType.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
GraphQLObjectType,
66
GraphQLFieldConfigMap,
77
} from 'graphql';
8-
import { merge } from 'lodash';
98
import { OwnerType } from './UserType';
109
import { Pet } from '../models/Pet';
1110
import { GraphQLContext } from '../../lib/graphql';
@@ -28,18 +27,18 @@ const PetFields: GraphQLFieldConfigMap = {
2827
export const PetOfUserType = new GraphQLObjectType({
2928
name: 'PetOfUser',
3029
description: 'A users pet',
31-
fields: () => merge<GraphQLFieldConfigMap, GraphQLFieldConfigMap>(PetFields, {}),
30+
fields: () => ({ ...PetFields, ...{} }),
3231
});
3332

3433
export const PetType = new GraphQLObjectType({
3534
name: 'Pet',
3635
description: 'A single pet.',
37-
fields: () => merge<GraphQLFieldConfigMap, GraphQLFieldConfigMap>(PetFields, {
36+
fields: () => ({ ...PetFields, ...{
3837
owner: {
3938
type: OwnerType,
4039
description: 'The owner of the pet',
4140
resolve: (pet: Pet, args: any, context: GraphQLContext<any, any>) =>
4241
context.dataLoaders.users.load(pet.userId),
4342
},
44-
}),
43+
} }),
4544
});

‎src/api/types/UserType.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
GraphQLFieldConfigMap,
66
GraphQLList,
77
} from 'graphql';
8-
import { merge } from 'lodash';
98
import { GraphQLContext } from '../../lib/graphql';
109
import { PetOfUserType } from './PetType';
1110
import { User } from '../models/User';
@@ -32,7 +31,7 @@ const UserFields: GraphQLFieldConfigMap = {
3231
export const UserType = new GraphQLObjectType({
3332
name: 'User',
3433
description: 'A single user.',
35-
fields: () => merge<GraphQLFieldConfigMap, GraphQLFieldConfigMap>(UserFields, {
34+
fields: () => ({ ...UserFields, ...{
3635
pets: {
3736
type: new GraphQLList(PetOfUserType),
3837
description: 'The pets of a user',
@@ -42,11 +41,11 @@ export const UserType = new GraphQLObjectType({
4241
// This would be the case with a normal service, but not very fast
4342
// context.container.get<PetService>(PetService).findByUser(user),
4443
},
45-
}),
44+
} }),
4645
});
4746

4847
export const OwnerType = new GraphQLObjectType({
4948
name: 'Owner',
5049
description: 'The owner of a pet',
51-
fields: () => merge<GraphQLFieldConfigMap, GraphQLFieldConfigMap>(UserFields, {}),
50+
fields: () => ({ ...UserFields, ...{} }),
5251
});

‎src/core/env.ts

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export const env = {
5656
graphql: {
5757
enabled: toBool(getOsEnv('GRAPHQL_ENABLED')),
5858
route: getOsEnv('GRAPHQL_ROUTE'),
59+
editor: toBool(getOsEnv('GRAPHQL_EDITOR')),
5960
},
6061
swagger: {
6162
enabled: toBool(getOsEnv('SWAGGER_ENABLED')),

‎src/lib/graphql/AbstractGraphQLHooks.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { UserError } from './graphql-error-handling';
33
export abstract class AbstractGraphQLHooks<TContext, TResult, TArgs> {
44

55
/**
6-
* This is our before hook. Here you are able
6+
* This is our before hook. Here we are able
77
* to alter the args object before the actual resolver(execute)
88
* will be called.
99
*/
@@ -12,15 +12,15 @@ export abstract class AbstractGraphQLHooks<TContext, TResult, TArgs> {
1212
}
1313

1414
/**
15-
* This our after hook. It will be called ater the actual resolver(execute).
15+
* This is our after hook. It will be called ater the actual resolver(execute).
1616
* There you are able to alter the result before it is send to the client.
1717
*/
1818
public after<S>(result: TResult, context: TContext, args?: TArgs, source?: S): Promise<TResult> | TResult {
1919
return result;
2020
}
2121

2222
/**
23-
* This our resolver, which should gather the needed data;
23+
* This is our resolver, which should gather the needed data;
2424
*/
2525
public run<S>(rootOrSource: S, args: TArgs, context: TContext): Promise<TResult> | TResult {
2626
throw new UserError('Query not implemented!');

0 commit comments

Comments
 (0)