Updated architecture and changed Build.Scripts task to tasks handler.

- Created new tasks:
  - Build.Scripts.Typescript
  - Build.Scripts.Tslint
- Moved tslint handler logic to a new builder.
  - Created tslint-builder.
- Updated task handler.
  - Optimized some logic.
  - Beautified some code.
  - TaskFunction can be builder Build function.

Author: Giedrius Grabauskas

src/builders/builder-base.ts

@@ -12,7 +12,7 @@ abstract class BuilderBase<TClass> {
 
     protected abstract initBuilder(production: boolean): TClass;
 
-    public Build(production: boolean, done: () => void) {
+    public Build = (production: boolean, done: () => void) => {
         let compiler = this.getBuilder(production);
         let maybePromise = this.build(production, compiler, done);
         if (maybePromise !== undefined) {
@@ -46,4 +46,4 @@ abstract class BuilderBase<TClass> {
 
 }
 
-export default BuilderBase;
+export default BuilderBase;

src/builders/tslint/tslint-builder.ts

@@ -0,0 +1,29 @@
+import BuilderBase from '../builder-base';
+import * as gulp from 'gulp';
+import Paths from '../../paths/paths';
+import tslint from 'gulp-tslint';
+import TsLintFormatter from './tslint-formatter';
+
+class TslintBuilder extends BuilderBase<void> {
+
+    protected build(production: boolean, builder: void, done: () => void) {
+
+        let tsSrc = gulp.src([
+                Paths.Builders.AllFiles.InSourceApp(".ts*"),
+                `!${Paths.Builders.AllFiles.InSourceApp("d.ts")}`
+            ]);
+        tsSrc = tsSrc.pipe(
+            tslint({
+                formatter: TsLintFormatter
+            }))
+            .on("end", done);
+    }
+
+
+    protected initBuilder(production: boolean) {
+        return;
+    }
+
+}
+
+export default new TslintBuilder();

…rs/typescript/tslint/tslint-formatter.ts src/builders/tslint/tslint-formatter.tssrc/builders/typescript/tslint/tslint-formatter.ts renamed to src/builders/tslint/tslint-formatter.ts src/builders/typescript/tslint/tslint-formatter.ts renamed to src/builders/tslint/tslint-formatter.ts

@@ -1,5 +1,5 @@
 import * as Lint from "tslint/lib/lint";
-import Logger from '../../../utils/logger';
+import Logger from '../../utils/logger';
 
 export default class ErrorHandler extends Lint.Formatters.AbstractFormatter {
     public format(failures: Lint.RuleFailure[]) {

src/builders/typescript/typescript-builder.ts

@@ -5,9 +5,6 @@ import * as path from 'path';
 import * as ts from 'gulp-typescript';
 import * as uglify from 'gulp-uglify';
 import * as sourcemaps from 'gulp-sourcemaps';
-import * as filter from 'gulp-filter';
-import tslint from 'gulp-tslint';
-import TsLintFormatter from './tslint/tslint-formatter';
 import TypescriptBuilderCompiler from './typescript-builder-compiler';
 import Logger from '../../utils/logger';
 
@@ -33,21 +30,16 @@ class TypescriptBuilder extends BuilderBase<TypescriptBuilderCompiler> {
 
     protected build(production: boolean, builder: TypescriptBuilderCompiler, done: () => void) {
 
-        let tsFilter = filter(["**/*", "!**/*.d.ts"], { restore: true });
-        let tsSrc = builder.Project.src();
-        let tsResult = tsSrc.pipe(tsFilter)
-            .pipe(tslint({
-                formatter: TsLintFormatter
-            }))
-            .pipe(tsFilter.restore);
+        let tsResult = builder.Project.src();
 
         if (!production) {
             tsResult = tsResult.pipe(sourcemaps.init());
         }
 
         tsResult = tsResult.pipe((builder.Project as any)(this.reporter)).js;
 
-        tsResult.pipe((production) ? uglify({ mangle: true }) : sourcemaps.write())
+        tsResult
+            .pipe((production) ? uglify({ mangle: true }) : sourcemaps.write())
             .pipe(gulp.dest(builder.Config.OutDir))
             .on("end", done);
     }

src/tasks/build/build-tasks-handler.ts

@@ -5,16 +5,16 @@ import { Task } from '../task-base';
 import BuildAssetsTask from './tasks/build-assets/buid-assets-task';
 import BuildConfigsTaskHandler from './tasks/build-configs/build-configs-tasks-handler';
 import BuildHtmlTask from './tasks/build-html/build-html-task';
-import BuildScriptsTask from './tasks/build-scripts/build-scripts-task';
+import BuildScriptsTaskHandler from './tasks/build-scripts/build-scripts-handler';
 import BuildStylesTask from './tasks/build-styles/build-styles-task';
 
 export default class BuildTasksHandler extends TasksHandler<Task> {
 
     constructor() {
         super(config => {
             config.Name = "Build";
-            config.Tasks = [BuildAssetsTask, BuildHtmlTask, BuildScriptsTask, BuildStylesTask];
-            config.TasksHandlers = [BuildConfigsTaskHandler];
+            config.Tasks = [BuildAssetsTask, BuildHtmlTask, BuildStylesTask];
+            config.TasksHandlers = [BuildConfigsTaskHandler, BuildScriptsTaskHandler];
             config.WithProduction = true;
             return config;
         });

src/tasks/build/tasks/build-scripts/build-scripts-handler.ts

@@ -0,0 +1,19 @@
+import TasksHandler from '../../../tasks-handler';
+import { Task } from '../../../task-base';
+
+//Tasks
+import BuildTypescript from './tasks/build-scripts-typescript-task';
+import BuildTslint from './tasks/build-scripts-tslint-task';
+
+export default class Tasks extends TasksHandler<Task> {
+
+    constructor() {
+        super(config => {
+            config.Name = "Build.Scripts";
+            config.Tasks = [BuildTypescript, BuildTslint];
+            config.WithProduction = true;
+            config.TasksAsync = true;
+            return config;
+        });
+    }
+}

src/tasks/build/tasks/build-scripts/build-scripts-task.ts

@@ -0,0 +1,11 @@
+import TaskBase from '../../../../task-base';
+import TsLintBuilder from '../../../../../builders/tslint/tslint-builder';
+
+export default class BuildScriptsTask extends TaskBase {
+
+    Name = "Build.Scripts.Tslint";
+
+    Description = "Compiles Tslint to check all source warnings";
+
+    TaskFunction = TsLintBuilder.Build;
+}

src/tasks/build/tasks/build-scripts/tasks/build-scripts-tslint-task.ts

@@ -0,0 +1,15 @@
+import TaskBase from '../../../../task-base';
+import TypescriptBuilder from '../../../../../builders/typescript/typescript-builder';
+
+export default class BuildScriptsTask extends TaskBase {
+
+    Name = "Build.Scripts.Typescript";
+
+    Description = "Compiles TypeScript from source to build directory";
+
+    // TaskFunction = (production: boolean, done: () => void) => {
+    //     return TypescriptBuilder.Build(production, done, this.Name);
+    // }
+
+    TaskFunction = TypescriptBuilder.Build;
+}

src/tasks/build/tasks/build-scripts/tasks/build-scripts-typescript-task.ts

@@ -7,9 +7,6 @@ export default class BuildStylesgTask extends TaskBase {
 
     Description = "Compiles *.scss files from source to build directory";
 
-    TaskFunction = (production: boolean, done: () => void) => {
-        StylesBuilder.Build(production, done);
-    }
-
+    TaskFunction = StylesBuilder.Build;
 
 }