Merge branch 'feature/simplify_paths' into develop

Author: dweber019

src/console/lib/console.ts

@@ -15,7 +15,6 @@ import * as path from 'path';
 import * as commander from 'commander';
 import * as figlet from 'figlet';
 import * as chalk from 'chalk';
-import { isWindows } from './../../core/helpers/Path';
 
 // It also loads the .env file into the 'process.env' variable.
 import { config } from 'dotenv';
@@ -39,7 +38,7 @@ figlet('console', (error: any, data: any) => {
             .filter(m => m.search(/\/lib/g) <= 0)
             .map(m => ({
                 path: m,
-                name: m.replace((isWindows() ? __dirname.replace(/\\/g, '/') : __dirname).replace('/lib', ''), '').replace('.ts', '').substring(1)
+                name: m.replace(__dirname.split(path.sep).join('/').replace('/lib', ''), '').replace('.ts', '').substring(1)
             }));
 
         const commands = files.map(f => require(f.path)[f.name]);

src/core/IoC.ts

@@ -13,7 +13,6 @@ import { Types, Core, Targets } from '../constants';
 import { events, EventEmitter } from './api/events';
 import { Logger } from './Logger';
 import { IocConfig } from '../config/IocConfig';
-import { getFolderWrapping } from './helpers/Path';
 
 
 export class IoC {
@@ -185,13 +184,13 @@ export class IoC {
     }
 
     private getBasePath(): string {
-        const baseFolder = __dirname.indexOf(getFolderWrapping('src')) >= 0 ? getFolderWrapping('src') : getFolderWrapping('dist');
+        const baseFolder = __dirname.indexOf(`${path.sep}src${path.sep}`) >= 0 ? `${path.sep}src${path.sep}` : `${path.sep}dist${path.sep}`;
         const baseRoot = __dirname.substring(0, __dirname.indexOf(baseFolder));
         return path.join(baseRoot, baseFolder, 'api');
     }
 
     private getFiles(filePath: string, done: (files: any[]) => void): void {
-        const isTypeScript = __dirname.indexOf(getFolderWrapping('src')) >= 0;
+        const isTypeScript = __dirname.indexOf(`${path.sep}src${path.sep}`) >= 0;
         if (!isTypeScript) {
             filePath = filePath.replace('.ts', '.js');
         }

src/core/Logger.ts

@@ -1,4 +1,4 @@
-import { getFolderWrapping, isWindows } from './helpers/Path';
+import * as path from 'path';
 
 /**
  * core.log.Log
@@ -31,17 +31,16 @@ export class Logger {
     private static Adapter: interfaces.LoggerAdapterConstructor;
     private static Adapters: Map<string, interfaces.LoggerAdapterConstructor> = new Map();
 
-    private static parsePathToScope(path: string): string {
-        const pathDelimiter = isWindows() ? '\\' : '/';
-        if (path.indexOf(pathDelimiter) >= 0) {
-            path = path.replace(process.cwd(), '');
-            path = path.replace(getFolderWrapping('src'), '');
-            path = path.replace(getFolderWrapping('dist'), '');
-            path = path.replace('.ts', '');
-            path = path.replace('.js', '');
-            path = path.replace(/\//g, ':');
+    private static parsePathToScope(filepath: string): string {
+        if (filepath.indexOf(path.sep) >= 0) {
+            filepath = filepath.replace(process.cwd(), '');
+            filepath = filepath.replace(`${path.sep}src${path.sep}`, '');
+            filepath = filepath.replace(`${path.sep}dist${path.sep}`, '');
+            filepath = filepath.replace('.ts', '');
+            filepath = filepath.replace('.js', '');
+            filepath = filepath.replace(path.sep, ':');
         }
-        return path;
+        return filepath;
     }
 
     private scope: string;

src/core/SwaggerUI.ts

@@ -2,7 +2,6 @@ import * as express from 'express';
 import * as path from 'path';
 import * as swaggerUi from 'swagger-ui-express';
 import { Environment } from './helpers/Environment';
-import { getFolderWrapping } from './helpers/Path';
 
 
 export class SwaggerUI {
@@ -13,7 +12,7 @@ export class SwaggerUI {
 
     public setup(app: express.Application): void {
         if (Environment.isTruthy(process.env.SWAGGER_ENABLED)) {
-            const baseFolder = __dirname.indexOf(getFolderWrapping('src')) >= 0 ? getFolderWrapping('src') : getFolderWrapping('dist');
+            const baseFolder = __dirname.indexOf(`${path.sep}src${path.sep}`) >= 0 ? `${path.sep}src${path.sep}` : `${path.sep}dist${path.sep}`;
             const basePath = __dirname.substring(0, __dirname.indexOf(baseFolder));
             const swaggerFile = require(path.join(basePath, process.env.SWAGGER_FILE));
             const packageJson = require(path.join(basePath, 'package.json'));