Skip to content

Commit 1140959

Browse files
committed
Fix tests and typescript errors
1 parent 2298438 commit 1140959

File tree

3 files changed

+37
-13
lines changed

3 files changed

+37
-13
lines changed

.env.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ AUTH_ROUTE=http://localhost:3333/tokeninfo
2323
#
2424
# DATABASE
2525
#
26-
DB_TYPE=sqlite
27-
DB_DATABASE=./mydb.sql
28-
DB_LOGGING=false
26+
TYPEORM_CONNECTION=sqlite
27+
TYPEORM_DATABASE=./mydb.sql
28+
TYPEORM_LOGGING=false
2929

3030
#
3131
# GraphQL

src/env.ts

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,39 @@ export const env = {
2727
port: normalizePort(process.env.PORT || getOsEnv('APP_PORT')),
2828
banner: toBool(getOsEnv('APP_BANNER')),
2929
dirs: {
30-
migrations: getOsEnvArray('TYPEORM_MIGRATIONS') || [path.relative(path.join(process.cwd()), path.join(__dirname, 'database/migrations/**/*.ts'))],
30+
migrations: (
31+
getOsEnvArray('TYPEORM_MIGRATIONS') ||
32+
[path.relative(path.join(process.cwd()), path.join(__dirname, 'database/migrations/**/*.ts'))]
33+
) as string[],
3134
migrationsDir: getOsEnv('TYPEORM_MIGRATIONS_DIR') || path.relative(path.join(process.cwd()), path.join(__dirname, 'database/migrations')),
32-
entities: getOsEnvArray('TYPEORM_ENTITIES') || [path.relative(path.join(process.cwd()), path.join(__dirname, 'api/models/**/*{.js,.ts}'))],
33-
subscribers: getOsEnvArray('TYPEORM_SUBSCRIBERS') || [path.join(__dirname, 'api/subscribers/**/*Subscriber{.js,.ts}')],
34-
controllers: getOsEnvArray('CONTROLLERS') || [path.join(__dirname, 'api/controllers/**/*Controller{.js,.ts}')],
35-
middlewares: getOsEnvArray('MIDDLEWARES') || [path.join(__dirname, 'api/middlewares/**/*Middleware{.js,.ts}')],
36-
interceptors: getOsEnvArray('INTERCEPTORS') || [path.join(__dirname, 'api/interceptors/**/*Interceptor{.js,.ts}')],
37-
queries: getOsEnvArray('QUERIES') || [path.join(__dirname, 'api/queries/**/*Query{.js,.ts}')],
38-
mutations: getOsEnvArray('MUTATIONS') || [path.join(__dirname, 'api/mutations/**/*Mutation{.js,.ts}')],
35+
entities: (
36+
getOsEnvArray('TYPEORM_ENTITIES') ||
37+
[path.relative(path.join(process.cwd()), path.join(__dirname, 'api/models/**/*{.js,.ts}'))]
38+
) as string[],
39+
subscribers: (
40+
getOsEnvArray('TYPEORM_SUBSCRIBERS') ||
41+
[path.join(__dirname, 'api/subscribers/**/*Subscriber{.js,.ts}')]
42+
) as string[],
43+
controllers: (
44+
getOsEnvArray('CONTROLLERS') ||
45+
[path.join(__dirname, 'api/controllers/**/*Controller{.js,.ts}')]
46+
) as string[],
47+
middlewares: (
48+
getOsEnvArray('MIDDLEWARES') ||
49+
[path.join(__dirname, 'api/middlewares/**/*Middleware{.js,.ts}')]
50+
) as string[],
51+
interceptors: (
52+
getOsEnvArray('INTERCEPTORS') ||
53+
[path.join(__dirname, 'api/interceptors/**/*Interceptor{.js,.ts}')]
54+
) as string[],
55+
queries: (
56+
getOsEnvArray('QUERIES') ||
57+
[path.join(__dirname, 'api/queries/**/*Query{.js,.ts}')]
58+
) as string[],
59+
mutations: (
60+
getOsEnvArray('MUTATIONS') ||
61+
[path.join(__dirname, 'api/mutations/**/*Mutation{.js,.ts}')]
62+
) as string[],
3963
},
4064
},
4165
log: {

src/lib/env/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ export function getOsEnv(key: string): string {
22
return process.env[key] as string;
33
}
44

5-
export function getOsEnvArray(value: string, delimiter: string = ','): string[] | boolean {
6-
return value && value.split(delimiter) || false;
5+
export function getOsEnvArray(key: string, delimiter: string = ','): string[] | boolean {
6+
return process.env[key] && process.env[key].split(delimiter) || false;
77
}
88

99
export function toNumber(value: string): number {

0 commit comments

Comments
 (0)