diff --git a/dist/npmts.compile.js b/dist/npmts.compile.js index 503122f..c8d098f 100644 --- a/dist/npmts.compile.js +++ b/dist/npmts.compile.js @@ -28,22 +28,20 @@ var compileTs = function (tsFileArrayArg, tsOptionsArg) { var _loop_1 = function (keyArg) { plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue); if (helpers.checkOutputPath(tsFileArrayArg, keyArg)) { - var filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(), keyArg) + plugins.smartfile.fs.listFileTree(process.cwd(), keyArg) .then(function (filesToConvertArg) { var filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg, process.cwd()); var destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg], process.cwd()); - var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir, compilerOptions(keyArg)); - promiseArray.push(filesCompiledPromise); + return plugins.tsn.compile(filesToConvertAbsolute, destDir, compilerOptions(keyArg)); + }) + .then(function () { + done.resolve(); }); - promiseArray.push(filesReadPromise); } }; for (var keyArg in tsFileArrayArg) { _loop_1(keyArg); } - ; - plugins.Q.all(promiseArray) - .then(done.resolve); return done.promise; }; exports.run = function (configArg) { diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts index 755cb31..8390102 100644 --- a/ts/npmts.compile.ts +++ b/ts/npmts.compile.ts @@ -30,22 +30,21 @@ let compileTs = (tsFileArrayArg: string[],tsOptionsArg = {}) => { for (let keyArg in tsFileArrayArg) { plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`) if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) { - let filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(),keyArg) - .then((filesToConvertArg) => { + plugins.smartfile.fs.listFileTree(process.cwd(),keyArg) + .then((filesToConvertArg: string[]) => { let filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg,process.cwd()) let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd()) - let filesCompiledPromise = plugins.tsn.compile( + return plugins.tsn.compile( filesToConvertAbsolute, destDir, compilerOptions(keyArg) ) - promiseArray.push(filesCompiledPromise) }) - promiseArray.push(filesReadPromise) + .then(() => { + done.resolve() + }) } - }; - plugins.Q.all(promiseArray) - .then(done.resolve) + } return done.promise }