Fix banned words check and update dts-critic

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtslint",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "Runs tests on TypeScript definition files",
   "files": [
     "bin",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "definitelytyped-header-parser": "1.2.0",
-    "dts-critic": "^1.0.9",
+    "dts-critic": "^1.2.0",
     "fs-extra": "^6.0.1",
     "request": "^2.88.0",
     "strip-json-comments": "^2.0.1",

src/checks.ts

@@ -1,7 +1,7 @@
 import assert = require("assert");
 import { makeTypesVersionsForPackageJson, TypeScriptVersion } from "definitelytyped-header-parser";
 import { pathExists } from "fs-extra";
-import { basename, join as joinPaths } from "path";
+import { join as joinPaths } from "path";
 
 import { getCompilerOptions, readJson } from "./util";
 
@@ -17,14 +17,6 @@ export async function checkPackageJson(
         }
         return;
     }
-    const basedir = basename(dirPath);
-    if (/download/.test(basedir) &&
-        basedir !== "download" &&
-        basedir !== "downloadjs" &&
-        basedir !== "s3-download-stream") {
-        // Since npm won't release their banned-words list, we'll have to manually add to this list.
-        throw new Error(`${dirPath}: Contains the word 'download', which is banned by npm.`);
-    }
 
     const pkgJson = await readJson(pkgJsonPath) as {};
 

src/index.ts

@@ -127,6 +127,7 @@ async function runTests(
         // Someone may have copied text from DefinitelyTyped to their type definition and included a header,
         // so assert that we're really on DefinitelyTyped.
         assertPathIsInDefinitelyTyped(dirPath);
+        assertPathIsNotBanned(dirPath);
     }
 
     const typesVersions = await mapDefinedAsync(await readdir(dirPath), async name => {
@@ -218,6 +219,17 @@ function assertPathIsInDefinitelyTyped(dirPath: string): void {
     }
 }
 
+function assertPathIsNotBanned(dirPath: string) {
+    const basedir = basename(dirPath);
+    if (/download/.test(basedir) &&
+        basedir !== "download" &&
+        basedir !== "downloadjs" &&
+        basedir !== "s3-download-stream") {
+        // Since npm won't release their banned-words list, we'll have to manually add to this list.
+        throw new Error(`${dirPath}: Contains the word 'download', which is banned by npm.`);
+    }
+}
+
 function getTypeScriptVersionFromComment(text: string): TypeScriptVersion | undefined {
     const searchString = "// TypeScript Version: ";
     const x = text.indexOf(searchString);

src/rules/npmNamingRule.ts

@@ -39,8 +39,6 @@ function walk(ctx: Lint.WalkContext<void>): void {
             if (e.message.indexOf("d.ts file must have a matching npm package") > -1 ||
                 e.message.indexOf("The non-npm package") > -1) {
                 lookFor("// Type definitions for", e.message);
-            } else if (e.message.indexOf("At least one of the project urls listed") > -1) {
-                lookFor("// Project:", e.message);
             } else if (e.message.indexOf("export default") > -1) {
                 lookFor("export default", e.message);
             } else {