Support for typescript@2.2.2 and tslint@5.0.0, Fixes #2, #3

Author: Ling

.gitignore

@@ -3,3 +3,4 @@
 npm-debug.log
 node_modules/
 bin/
+release/

README.md

@@ -49,6 +49,9 @@ export PATH=$PATH:node_modules/.bin
 
 ## Updates
 
+### 0.3.30
+  - Support for typescript@2.2.2 and tslint@5.0.0
+
 ### 0.3.2
   - Format ts files when you run `standard --pretty`
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-standard",
-  "version": "0.3.14",
+  "version": "0.3.30",
   "engines": {
     "node": ">=4.0.0"
   },
@@ -11,9 +11,9 @@
   },
   "scripts": {
     "test": "node_modules/.bin/standard --pretty",
-    "build": "npm run build:clean && npm run build:webpack",
-    "build:clean": "rm -f ./bin/*.js",
-    "build:tsc": "node_modules/.bin/tsc -p tsconfig.release.json",
+    "build": "npm run build:clean && npm run build:tsc && npm run build:webpack",
+    "build:clean": "rm -rf ./bin ./release",
+    "build:tsc": "npm run build:clean && node_modules/.bin/tsc --noEmit -p tsconfig.release.json",
     "build:webpack": "node_modules/.bin/webpack --display-error-details --config ./webpack.config.ts",
     "prepublish": "npm run build"
   },
@@ -49,15 +49,14 @@
   "devDependencies": {
     "@types/glob": "latest",
     "@types/node": "latest",
-    "@types/webpack": "latest",
     "ts-loader": "latest",
     "ts-node": "latest",
     "typescript-standard": "latest",
     "webpack": "latest"
   },
   "dependencies": {
-    "glob": "latest",
-    "tslint": "latest",
-    "typescript": "latest"
+    "glob": "^7.1.1",
+    "tslint": "^5.0.0",
+    "typescript": "^2.2.2"
   }
 }

src/lib/validator/config.ts

@@ -2,6 +2,7 @@ import * as path from 'path'
 import * as glob from 'glob'
 import { findup, find, load, isDirectory, includesInArray, startsWith } from '../utils'
 import { ValidatorOption } from './option'
+import { Linter } from 'tslint';
 
 export class ValidatorConfigParser {
 
@@ -10,7 +11,7 @@ export class ValidatorConfigParser {
     if (!defaultTSLintOptions) {
       return null;
     }
-    const configuration = load(defaultTSLintOptions);
+    const configuration = Linter.loadConfigurationFromPath(defaultTSLintOptions);
     return new ValidatorOption(format, configuration);
   }
 

src/lib/validator/format.ts

@@ -1,31 +1,13 @@
-import { Formatters } from 'tslint'
+import { FormatterFunction, Formatters } from 'tslint'
 
 export class ValidatorOutputFormat {
 
-  // values
-  static PROSE_OUTPUT = Formatters.ProseFormatter;
-  static JSON_OUTPUT = Formatters.JsonFormatter;
-  static PMD_OUTPUT = Formatters.PmdFormatter;
-  static VERBOSE_OUTPUT = Formatters.VerboseFormatter;
-  static STYLISH_OUTPUT = Formatters.StylishFormatter;
-  static FILELIST_OUTPUT = Formatters.FileslistFormatter;
-
-  static getFormatter(formatter: string): Function {
-    switch (formatter) {
-      case 'prose':
-        return ValidatorOutputFormat.PROSE_OUTPUT;
-      case 'json':
-        return ValidatorOutputFormat.JSON_OUTPUT;
-      case 'pmg':
-        return ValidatorOutputFormat.PMD_OUTPUT;
-      case 'verbose':
-        return ValidatorOutputFormat.VERBOSE_OUTPUT;
-      case 'stylish':
-        return ValidatorOutputFormat.STYLISH_OUTPUT;
-      case 'filelist':
-        return ValidatorOutputFormat.FILELIST_OUTPUT;
-      default:
-        return ValidatorOutputFormat.JSON_OUTPUT;
+  static getFormatter(formatter: string): string | FormatterFunction {
+    if (formatter) {
+      return formatter
+    }
+    else {
+      return 'json';
     }
   }
 

src/lib/validator/option.ts

@@ -1,11 +1,11 @@
-import { ILinterOptions } from 'tslint'
+import { FormatterFunction, ILinterOptions } from 'tslint'
 import { ValidatorOutputFormat } from './format';
 import { IConfigurationFile } from 'tslint/lib/configuration';
 
 export class ValidatorOption {
 
   configuration?: IConfigurationFile;
-  formatter?: Function;
+  formatter?: string | FormatterFunction;
   formattersDirectory?: string;
   rulesDirectory?: string | string[];
 

src/lib/validator/result.ts

@@ -9,7 +9,7 @@ export class ValidateResult {
   output: string;
 
   constructor(result: LintResult) {
-    this.failureCount = result.failureCount;
+    this.failureCount = result.errorCount;
     this.failures = result.failures;
     this.format = result.format;
     this.output = result.output;

src/lib/validator/validator.ts

@@ -20,7 +20,8 @@ export class Validator {
     const contents = fs.readFileSync(file, 'utf8');
     const linter = new Linter(this.validatorOption.options());
     linter.lint(file, contents, this.validatorOption.configuration);
-    return new ValidateResult(linter.getResult());
+    const results = linter.getResult();
+    return new ValidateResult(results);
   }
 
 }

tsconfig.json

@@ -10,8 +10,7 @@
       "node_modules/@types/"
     ],
     "types": [
-      "node",
-      "webpack"
+      "node"
     ]
   },
   "formatterOptions": {

tsconfig.release.json

@@ -1,15 +1,12 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "es5"
-    ],
+    "target": "es6",
+    "lib": ["es2016"],
     "declaration": true,
     "module": "commonjs",
     "newLine": "LF",
     "removeComments": true,
     "experimentalDecorators": true,
-    "sourceMap": true,
     "outDir": "release",
     "pretty": true
   },

tslint.json

@@ -1,4 +1,7 @@
 {
+  "jsRules": {
+    "curly": true
+  },
   "rules": {
     "member-access": false,
     "member-ordering": [

webpack.config.ts

@@ -27,15 +27,15 @@ export default [{
   },
   externals: externalNodeModules,
   resolve: {
-    extensions: ['', '.ts']
+    extensions: ['.ts']
   },
   module: {
     loaders: [
       { test: /\.ts$/, loader: 'ts-loader' }
     ]
   },
   plugins: [
-    new webpack.BannerPlugin('#!/usr/bin/env node', { raw: 1, entryOnly: 1 })
+    new webpack.BannerPlugin({ banner: '#!/usr/bin/env node', raw: 1, entryOnly: 1 })
     // new webpack.optimize.UglifyJsPlugin({
     //   compress: {
     //     warnings: false
@@ -58,7 +58,7 @@ export default [{
   },
   externals: externalNodeModules,
   resolve: {
-    extensions: ['', '.ts']
+    extensions: ['.ts']
   },
   module: {
     loaders: [