Minor improvements

Author: barbatus

file-mixin.js

@@ -1,4 +1,14 @@
+const createHash = Npm.require('crypto').createHash;
+
 FileMixin = {
+  id() {
+    let hash = createHash('sha1');
+    let path = this.getPathInPackage();
+    let fileHash = this.getSourceHash();
+    let fileId = hash.update(path + fileHash).digest('hex');
+    return fileId;
+  },
+
   warn(error) {
     console.log(`${error.sourcePath} (${error.line}, ${error.column}): ${error.message}`);
   },

package.js

@@ -1,13 +1,13 @@
 Package.describe({
   name: 'barbatus:typescript-compiler',
-  version: '0.5.6',
+  version: '0.5.7',
   summary: 'TypeScript Compiler for Meteor',
   git: 'https://github.com/barbatus/ts-compilers',
   documentation: 'README.md'
 });
 
 Npm.depends({
-  'meteor-typescript': '0.6.2',
+  'meteor-typescript': '0.6.4',
   'async': '1.4.0',
   'minimatch': '3.0.0'
 });

typescript-compiler.js

@@ -52,8 +52,7 @@ TypeScriptCompiler = class TypeScriptCompiler {
     let buildOptions = { compilerOptions, typings, useCache };
 
     let dcompile = Logger.newDebug('compilation');
-    const future = new Future;
-    async.each(_.keys(archMap), (arch, cb) => {
+    _.keys(archMap).forEach((arch, cb) => {
       let archFiles = archMap[arch];
       let filePaths = archFiles.map(inputFile => this.getExtendedPath(inputFile));
       dcompile.log('process files: %s', filePaths);
@@ -62,8 +61,9 @@ TypeScriptCompiler = class TypeScriptCompiler {
       let dbuild = Logger.newDebug('tsBuild');
       let tsBuild = new TSBuild(filePaths, getFileContent, buildOptions);
 
-      archFiles.forEach(inputFile => {
-        if (inputFile.isDeclaration()) return;
+      let future = new Future;
+      async.each(archFiles, (inputFile, cb) => {
+        if (inputFile.isDeclaration()) { cb(); return; };
 
         let co = compilerOptions;
         let source = inputFile.getContentsAsString();
@@ -93,14 +93,14 @@ TypeScriptCompiler = class TypeScriptCompiler {
         toBeAdded.sourceMap = result.sourceMap;
 
         inputFile.addJavaScript(toBeAdded);
-      });
 
-      cb();
+        cb();
+      }, future.resolver());
 
-      dbuild.end();
-    }, future.resolver());
+      future.wait();
 
-    future.wait();
+      dbuild.end();
+    });
 
     dcompile.end();
   }
@@ -196,8 +196,9 @@ TypeScriptCompiler = class TypeScriptCompiler {
     let dexclude = Logger.newDebug('exclude');
     for (let ex of this.tsconfig.exclude) {
       resultFiles = resultFiles.filter(inputFile => {
-        dexclude.log('exclude pattern %s', ex);
-        return ! minimatch(inputFile.getPathInPackage(), ex);
+        let path = inputFile.getPathInPackage();
+        dexclude.log('exclude pattern %s: %s', ex, path);
+        return ! minimatch(path, ex);
       });
     }
     dexclude.end();