Merge pull request #854 from palantir/update-next

Prepare release 3.2.0-dev.1

CHANGELOG.md

@@ -1,10 +1,25 @@
 Change Log
 ===
 
+v3.2.0-dev.1
+---
+* [bugfix] fixed bug in how custom rules directories are registered (#844)
+* [enhancement] better support for globs in CLI (#827)
+* [new-rule] `no-null-keyword` rule (#722)
+
+v3.1.1
+---
+* Bump TypeScript peer dependency to `>= 1.7.3` due to `const enum` incompatibility (#832)
+
+v3.1.0
+---
+* [bugfix] build with TS v1.7.3 to fix null pointer exception (#832)
+* [bugfix] fixed false positive in `no-require-imports` rule (#816)
+
 v3.1.0-dev.1
 ---
 * [bugfix] fixed `no-shadowed-variable` false positives when handling destructuring in function params (#727)
-- [enhancement] `rulesDirectory` in `tslint.json` now supports multiple file paths (#795)
+* [enhancement] `rulesDirectory` in `tslint.json` now supports multiple file paths (#795)
 
 v3.0.0
 ---
@@ -19,7 +34,7 @@ v3.0.0
 
 v3.0.0-dev.3
 ---
-* Typescript is now a peerDependency (#791)
+* TypeScript is now a peerDependency (#791)
 * [bugfix] `no-unused-variable` rule with `react` option works with self-closing JSX tags (#776)
 * [bugfix] `use-strict` bugfix (#544)
 

Gruntfile.js

@@ -78,8 +78,17 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-ts");
 
     // register custom tasks
-    grunt.registerTask("core", ["clean:core", "ts:core", "tslint:src"]);
-    grunt.registerTask("test", ["clean:test", "ts:test", "tslint:test", "mochaTest"].concat(checkBinTest));
+    grunt.registerTask("core", [
+        "clean:core",
+        "ts:core",
+        "tslint:src"
+    ]);
+    grunt.registerTask("test", [
+        "clean:test",
+        "ts:test",
+        "tslint:test",
+        "mochaTest"
+    ].concat(checkBinTest));
 
     // create default task
     grunt.registerTask("default", ["jscs", "core", "test"]);

README.md

@@ -187,7 +187,8 @@ A sample configuration file with all options is available [here](https://github.
 * `no-eval` disallows `eval` function invocations.
 * `no-inferrable-types` disallows explicit type declarations for variables or parameters initialized to a number, string, or boolean.
 * `no-internal-module` disallows internal `module` (use `namespace` instead).
-* `no-require-imports` disallows `require()` style imports (use ES6-style imports instead).
+* `no-null-keyword` disallows use of the `null` keyword literal
+* `no-require-imports` disallows invocation of `require()` (use ES6-style imports instead).
 * `no-shadowed-variable` disallows shadowed variable declarations.
 * `no-string-literal` disallows object access via string literals.
 * `no-switch-case-fall-through` disallows falling through case statements.

docs/sample.tslint.json

@@ -57,6 +57,7 @@
     "no-eval": true,
     "no-inferrable-types": false,
     "no-internal-module": true,
+    "no-null-keyword": true,
     "no-require-imports": true,
     "no-shadowed-variable": true,
     "no-string-literal": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.1.0-dev.1",
+  "version": "3.2.0-dev.1",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "findup-sync": "~0.2.1",
+    "glob": "^6.0.1",
     "optimist": "~0.6.0",
     "underscore.string": "~3.1.1"
   },
@@ -39,7 +40,7 @@
     "typescript": "next"
   },
   "peerDependencies": {
-    "typescript": ">=1.7.0 || >=1.7.0-dev.20151003 || >=1.8.0-dev"
+    "typescript": ">=1.7.3 || >=1.7.0-dev.20151003 || >=1.8.0-dev"
   },
   "license": "Apache-2.0"
 }

src/configuration.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,6 +35,7 @@ const DEFAULT_CONFIG = {
         "semicolon": true
     }
 };
+const moduleDirectory = path.dirname(module.filename);
 
 export function findConfiguration(configFile: string, inputFileLocation: string): any {
     if (configFile == null) {
@@ -84,3 +86,23 @@ function getHomeDir() {
         }
     }
 }
+
+export function getRelativePath(directory: string): string {
+    if (directory != null) {
+        return path.relative(moduleDirectory, directory);
+    }
+}
+
+export function getRulesDirectories(directories: string | string[]): string[] {
+    let rulesDirectories: string[] = [];
+
+    if (directories != null) {
+        if (typeof directories === "string") {
+            rulesDirectories = [getRelativePath(<string>directories)];
+        } else {
+            rulesDirectories = (<string[]>directories).map((dir) => getRelativePath(dir));
+        }
+    }
+
+    return rulesDirectories;
+}

src/enableDisableRules.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2014 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
+import * as ts from "typescript";
 import * as Lint from "./lint";
 import {SkippableTokenAwareRuleWalker} from "./language/walker/skippableTokenAwareRuleWalker";
-import * as ts from "typescript";
 
 export class EnableDisableRulesWalker extends SkippableTokenAwareRuleWalker {
     public enableDisableRuleMap: {[rulename: string]: Lint.IEnableDisablePosition[]} = {};

src/formatterLoader.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/formatters.ts

@@ -1,2 +1,19 @@
+/*
+ * @license
+ * Copyright 2013 Palantir Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 export * from "./language/formatter/abstractFormatter";
 export * from "./formatters/index";

src/formatters/index.ts

@@ -1,3 +1,20 @@
+/**
+ * @license
+ * Copyright 2013 Palantir Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 export * from "./jsonFormatter";
 export * from "./pmdFormatter";
 export * from "./proseFormatter";

src/formatters/jsonFormatter.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-import * as Lint from "../lint";
 import {AbstractFormatter} from "../language/formatter/abstractFormatter";
+import {RuleFailure} from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {
-    public format(failures: Lint.RuleFailure[]): string {
+    public format(failures: RuleFailure[]): string {
         const failuresJSON = failures.map((failure) => failure.toJson());
         return JSON.stringify(failuresJSON);
     }

src/formatters/pmdFormatter.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-import * as Lint from "../lint";
 import {AbstractFormatter} from "../language/formatter/abstractFormatter";
+import {RuleFailure} from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {
-    public format(failures: Lint.RuleFailure[]): string {
+    public format(failures: RuleFailure[]): string {
         let output = "<pmd version=\"tslint\">";
 
         for (let failure of failures) {

src/formatters/proseFormatter.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-import * as Lint from "../lint";
 import {AbstractFormatter} from "../language/formatter/abstractFormatter";
+import {RuleFailure} from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {
-    public format(failures: Lint.RuleFailure[]): string {
-        const outputLines = failures.map((failure: Lint.RuleFailure) => {
+    public format(failures: RuleFailure[]): string {
+        const outputLines = failures.map((failure: RuleFailure) => {
             const fileName = failure.getFileName();
             const failureString = failure.getFailure();
 

src/formatters/verboseFormatter.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,13 +15,12 @@
  * limitations under the License.
  */
 
-import * as Lint from "../lint";
 import {AbstractFormatter} from "../language/formatter/abstractFormatter";
+import {RuleFailure} from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {
-    public format(failures: Lint.RuleFailure[]): string {
-
-        const outputLines = failures.map((failure: Lint.RuleFailure) => {
+    public format(failures: RuleFailure[]): string {
+        const outputLines = failures.map((failure: RuleFailure) => {
             const fileName = failure.getFileName();
             const failureString = failure.getFailure();
             const ruleName = failure.getRuleName();

src/language/formatter/abstractFormatter.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +15,9 @@
  * limitations under the License.
  */
 
-import * as Lint from "../../lint";
+import {RuleFailure} from "../rule/rule";
+import {IFormatter} from "./formatter";
 
-export abstract class AbstractFormatter implements Lint.IFormatter {
-    public abstract format(failures: Lint.RuleFailure[]): string;
+export abstract class AbstractFormatter implements IFormatter {
+    public abstract format(failures: RuleFailure[]): string;
 }

src/language/formatter/formatter.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2013 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +15,8 @@
  * limitations under the License.
  */
 
-import * as Lint from "../../lint";
+import {RuleFailure} from "../rule/rule";
 
 export interface IFormatter {
-    format(failures: Lint.RuleFailure[]): string;
+    format(failures: RuleFailure[]): string;
 }

src/language/languageServiceHost.ts

@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright 2014 Palantir Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-import * as Lint from "../lint";
 import * as ts from "typescript";
+import {createCompilerOptions} from "./utils";
 
 export function createLanguageServiceHost(fileName: string, source: string): ts.LanguageServiceHost {
     return {
-        getCompilationSettings: () => Lint.createCompilerOptions(),
+        getCompilationSettings: () => createCompilerOptions(),
         getCurrentDirectory: () => "",
         getDefaultLibFileName: () => "lib.d.ts",
         getScriptFileNames: () => [fileName],
@@ -30,6 +31,6 @@ export function createLanguageServiceHost(fileName: string, source: string): ts.
 }
 
 export function createLanguageService(fileName: string, source: string) {
-    const languageServiceHost = Lint.createLanguageServiceHost(fileName, source);
+    const languageServiceHost = createLanguageServiceHost(fileName, source);
     return ts.createLanguageService(languageServiceHost);
 }