🐛 Fix file paths

Author: hirsch88

.env.example

@@ -42,8 +42,10 @@ TYPEORM_LOGGING=false
 #
 TYPEORM_MIGRATIONS=src/database/migrations/**/*.ts
 TYPEORM_MIGRATIONS_DIR=src/database/migrations
-TYPEORM_ENTITIES=src/api/models/**/*{.js,.ts}.ts
-TYPEORM_SUBSCRIBERS=src/api/subscribers/**/*Subscriber{.js,.ts}
+TYPEORM_ENTITIES=src/api/models/**/*.ts,src/api/models/**/*.js
+TYPEORM_ENTITIES_DIR=src/api/models
+TYPEORM_SUBSCRIBERS=src/api/subscribers/**/*Subscriber.ts,src/api/subscribers/**/*Subscriber.js
+TYPEORM_SUBSCRIBERS_DIR=src/api/subscribers
 CONTROLLERS=src/api/controllers/**/*Controller{.js,.ts}
 MIDDLEWARES=src/api/middlewares/**/*Middleware{.js,.ts}
 INTERCEPTORS=src/api/interceptors/**/*Interceptor{.js,.ts}

.env.test

@@ -37,15 +37,16 @@ TYPEORM_LOGGING=false
 #
 TYPEORM_MIGRATIONS=src/database/migrations/**/*.ts
 TYPEORM_MIGRATIONS_DIR=src/database/migrations
-TYPEORM_ENTITIES=src/api/models/**/*{.js,.ts}.ts
-TYPEORM_SUBSCRIBERS=src/api/subscribers/**/*Subscriber{.js,.ts}
+TYPEORM_ENTITIES=src/api/models/**/*.ts,src/api/models/**/*.js
+TYPEORM_ENTITIES_DIR=src/api/models
+TYPEORM_SUBSCRIBERS=src/api/subscribers/**/*Subscriber.ts,src/api/subscribers/**/*Subscriber.js
+TYPEORM_SUBSCRIBERS_DIR=src/api/subscribers
 CONTROLLERS=src/api/controllers/**/*Controller{.js,.ts}
 MIDDLEWARES=src/api/middlewares/**/*Middleware{.js,.ts}
 INTERCEPTORS=src/api/interceptors/**/*Interceptor{.js,.ts}
 QUERIES=src/api/queries/**/*Query{.js,.ts}
 MUTATIONS=src/api/mutations/**/*Mutation{.js,.ts}
 
-
 #
 # GraphQL
 #

src/lib/env/utils.ts

@@ -2,8 +2,8 @@ export function getOsEnv(key: string): string {
     return process.env[key] as string;
 }
 
-export function getOsEnvArray(key: string, delimiter: string = ','): string[] | boolean {
-    return process.env[key] && process.env[key].split(delimiter) || false;
+export function getOsEnvArray(key: string, delimiter: string = ','): string[] {
+    return process.env[key] && process.env[key].split(delimiter) || [];
 }
 
 export function toNumber(value: string): number {

src/lib/graphql/importClassesFromDirectories.ts

@@ -27,7 +27,7 @@ export function importClassesFromDirectories(directories: string[], formats: str
             return formats.indexOf(path.extname(file)) !== -1 && dtsExtension !== '.d.ts';
         })
         .map(file => {
-            return require(file);
+            return require(path.join(process.cwd(), file));
         });
 
     return loadFileClasses(dirs, []);

src/loaders/eventDispatchLoader.ts

@@ -1,5 +1,6 @@
 import * as glob from 'glob';
 import { MicroframeworkLoader, MicroframeworkSettings } from 'microframework-w3tec';
+import * as path from 'path';
 
 import { env } from '../env';
 
@@ -15,7 +16,7 @@ export const eventDispatchLoader: MicroframeworkLoader = (settings: Microframewo
         patterns.forEach((pattern) => {
             glob(pattern, (err: any, files: string[]) => {
                 for (const file of files) {
-                    require(file);
+                    require(path.join(process.cwd(), file));
                 }
             });
         });

src/loaders/expressLoader.ts

@@ -1,5 +1,6 @@
 import { Application } from 'express';
 import { MicroframeworkLoader, MicroframeworkSettings } from 'microframework-w3tec';
+import * as path from 'path';
 import { createExpressServer } from 'routing-controllers';
 
 import { authorizationChecker } from '../auth/authorizationChecker';
@@ -23,9 +24,9 @@ export const expressLoader: MicroframeworkLoader = (settings: MicroframeworkSett
              * We can add options about how routing-controllers should configure itself.
              * Here we specify what controllers should be registered in our express server.
              */
-            controllers: env.app.dirs.controllers,
-            middlewares: env.app.dirs.middlewares,
-            interceptors: env.app.dirs.interceptors,
+            controllers: env.app.dirs.controllers.map(controller => path.join(process.cwd(), controller)),
+            middlewares: env.app.dirs.middlewares.map(middleware => path.join(process.cwd(), middleware)),
+            interceptors: env.app.dirs.interceptors.map(interceptor => path.join(process.cwd(), interceptor)),
 
             /**
              * Authorization features