Merge pull request #11 from Tyderion/bugfix/update-targets

Fix update targets on windows

Author: dweber019

src/console/UpdateTargetsCommand.ts

@@ -5,6 +5,7 @@
  * This script reads all the api files and generate the
  * needed ioc targets file.
  */
+import * as path from 'path';
 import * as _ from 'lodash';
 import * as glob from 'glob';
 import * as handlebars from 'handlebars';
@@ -40,40 +41,40 @@ export class UpdateTargetsCommand extends AbstractCommand {
             return json.replace(/\"([^(\")"]+)\":/g, '$1:').replace(/"/g, '\'');
         });
 
-        const path = __dirname.replace('console', 'constants') + `/${this.targetFile}`;
-        await existsFile(path, true);
-        await writeTemplate(this.template, path, context);
+        const filepath = path.join(__dirname.replace('console', 'constants'), this.targetFile);
+        await existsFile(filepath, true);
+        await writeTemplate(this.template, filepath, context);
 
     }
 
     private async getFiles(): Promise<string[]> {
         return new Promise<string[]>((resolve, reject) => {
-            const path = __dirname.replace('console', 'api');
-            glob(`${path}/**/*.ts`, (err: any, files: string[]) => {
+            const filepath = path.normalize(__dirname.replace('console', 'api'));
+            glob(`${path.join(filepath, '**', '*.ts')}`, (err: any, files: string[]) => {
                 if (err) {
                     return reject(err);
                 }
                 files = files
-                    .map((f) => f.replace(path + '/', ''))
+                    .map(f => path.normalize(f))
+                    .map((f) => f.replace(filepath + path.sep, ''))
                     .map((f) => f.replace('.ts', ''));
-
                 resolve(files);
             });
         });
     }
 
     private divideFilePath(filePath: string): any {
-        const fs = filePath.split('/');
+        const fs = filePath.split(path.sep);
         const key = fs[0];
         fs.splice(0, 1);
         return {
             key,
-            path: fs.join('/')
+            path: fs.join(path.sep)
         };
     }
 
     private parseFilePath(filePath: string): any {
-        if (filePath.indexOf('/') !== -1) {
+        if (filePath.indexOf(path.sep) !== -1) {
             const obj = this.divideFilePath(filePath);
             return {
                 [obj.key]: this.parseFilePath(obj.path)

src/console/lib/utils.ts

@@ -46,15 +46,15 @@ export const existsFile = async (filePath: string, stop: boolean = false, isTest
         fs.exists(filePath, async (exists) => {
 
             if (exists) {
-                let fileName = filePath.split('/src/')[1];
+                let fileName = filePath.split(path.normalize('/src/'))[1];
                 if (isTest) {
-                    fileName = filePath.split('/test/')[1];
+                    fileName = filePath.split(path.normalize('/test/'))[1];
                 }
                 const answer = await prompt([
                     {
                         type: 'confirm',
                         name: 'override',
-                        message: `Override "${isTest ? 'test' : 'src'}/${fileName}"?`,
+                        message: `Override "${path.join(isTest ? 'test' : 'src', fileName)}"?`,
                         default: true
                     }
                 ]);