@definitelytyped/eslint-plugin 0.0.187 → 0.0.189

package/test/no-declare-current-package.test.ts

@@ -1,59 +1,59 @@
-import { ESLintUtils } from "@typescript-eslint/utils";
-
 import * as noDeclareCurrentPackage from "../src/rules/no-declare-current-package";
+import { runTestsWithFixtures } from "./fixtureTester";
 
-const ruleTester = new ESLintUtils.RuleTester({
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 2018,
-  },
-});
-
-ruleTester.run("@definitelytyped/no-declare-current-package", noDeclareCurrentPackage, {
+runTestsWithFixtures("@definitelytyped/no-declare-current-package", noDeclareCurrentPackage, {
+  valid: [
+    {
+      filename: "types/foo/index.d.ts",
+    },
+    {
+      filename: "types/no-declare-current-package-other/index.d.ts",
+    },
+  ],
   invalid: [
     {
-      filename: "types/test/index.d.ts",
-      code: `module "test" { }`,
+      filename: "types/no-declare-current-package/index.d.ts",
       errors: [
         {
-          line: 1,
           messageId: "noDeclareCurrentPackage",
+          data: { text: "no-declare-current-package", preferred: '"index.d.ts"' },
         },
       ],
     },
     {
-      filename: "types/test/deep/import.d.ts",
-      code: `module "test/deep/import" { }`,
+      filename: "types/no-declare-current-package/test/deep/import.d.ts",
       errors: [
         {
-          line: 1,
           messageId: "noDeclareCurrentPackage",
+          data: {
+            text: "no-declare-current-package/deep/import",
+            preferred:
+              '"no-declare-current-package/deep/import.d.ts" or "no-declare-current-package/deep/import/index.d.ts"',
+          },
         },
       ],
     },
     {
-      filename: "types/scope__name/index.d.ts",
-      code: `module "@scope/name" { }`,
+      filename: "types/scoped__no-declare-current-package/index.d.ts",
       errors: [
         {
-          line: 1,
           messageId: "noDeclareCurrentPackage",
+          data: { text: "@scoped/no-declare-current-package", preferred: '"index.d.ts"' },
         },
       ],
     },
-  ],
-  valid: [
-    {
-      filename: "types/other/index.d.ts",
-      code: `module "foo" { }`,
-    },
-    {
-      filename: "types/other/index.d.ts",
-      code: `module "foo/bar/baz" { }`,
-    },
     {
-      filename: "types/deep/other/index.d.ts",
-      code: `module "other" { }`,
+      filename: "types/scoped__no-declare-current-package/test/deep/import.d.ts",
+      errors: [
+        {
+          messageId: "noDeclareCurrentPackage",
+          data: {
+            text: "@scoped/no-declare-current-package/deep/import",
+            preferred:
+              '"@scoped/no-declare-current-package/deep/import.d.ts" or "@scoped/no-declare-current-package/deep/import/index.d.ts"',
+          },
+        },
+      ],
     },
   ],
 });

package/test/no-import-of-dev-dependencies.test.ts

@@ -1,72 +1,27 @@
-import { ESLintUtils } from "@typescript-eslint/utils";
-
 import * as noImportDefaultOfDevDependencies from "../src/rules/no-import-of-dev-dependencies";
+import { runTestsWithFixtures } from "./fixtureTester";
 
-const ruleTester = new ESLintUtils.RuleTester({
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 2018,
-  },
-});
-
-ruleTester.run("@definitelytyped/no-import-of-dev-dependencies", noImportDefaultOfDevDependencies, {
-  invalid: [
-    {
-      filename: "index.d.ts",
-      code: `import eslint from "eslint"`,
-      errors: [
-        {
-          line: 1,
-          messageId: "noImportOfDevDependencies",
-        },
-      ],
-    },
-    // test @types/ removal
-    {
-      filename: "index.d.ts",
-      code: `import yargs from "yargs"`,
-      errors: [
-        {
-          line: 1,
-          messageId: "noImportOfDevDependencies",
-        },
-      ],
-    },
-    {
-      filename: "index.d.ts",
-      code: `/// <reference types="node" />`,
-      errors: [
-        {
-          line: 1,
-          messageId: "noReferenceOfDevDependencies",
-        },
-      ],
-    },
-  ],
+runTestsWithFixtures("@definitelytyped/no-import-of-dev-dependencies", noImportDefaultOfDevDependencies, {
   valid: [
     {
-      filename: "index.d.ts",
-      code: `import other from 'other'`,
-    },
-    {
-      filename: "types/yargs/index.d.ts",
-      code: `import self from "yargs"`,
+      filename: "types/foo/index.d.ts",
     },
     {
-      filename: "index.d.ts",
-      code: `/// <reference types="other"/>`,
+      filename: "types/no-import-of-dev-dependencies/index.d.ts",
     },
     {
-      filename: "test.ts",
-      code: `import eslint from "eslint"`,
-    },
-    {
-      filename: "test.ts",
-      code: `import yargs from "yargs"`,
+      filename: "types/no-import-of-dev-dependencies/no-import-of-dev-dependencies-tests.ts",
     },
+  ],
+  invalid: [
     {
-      filename: "test.ts",
-      code: `/// <reference types="node" />`,
+      filename: "types/no-import-of-dev-dependencies/bad.d.ts",
+      errors: [
+        { messageId: "noReferenceOfDevDependencies" },
+        { messageId: "noReferenceOfDevDependencies" },
+        { messageId: "noImportOfDevDependencies" },
+        { messageId: "noImportOfDevDependencies" },
+      ],
     },
   ],
 });

package/test/no-self-import.test.ts

@@ -1,114 +1,30 @@
-import { ESLintUtils } from "@typescript-eslint/utils";
-
 import * as dtHeader from "../src/rules/no-self-import";
+import { runTestsWithFixtures } from "./fixtureTester";
 
-const ruleTester = new ESLintUtils.RuleTester({
-  parser: "@typescript-eslint/parser",
-});
-
-ruleTester.run("@definitelytyped/no-self-import", dtHeader, {
-  invalid: [
-    {
-      code: `import myself from "this-package";`,
-      errors: [
-        {
-          line: 1,
-          messageId: "useRelativeImport",
-        },
-      ],
-      filename: "types/this-package/index.d.ts",
-    },
-    {
-      code: `import abc from "this-package/abc.d.ts";`,
-      errors: [
-        {
-          line: 1,
-          messageId: "useRelativeImport",
-        },
-      ],
-      filename: "types/this-package/index.d.ts",
-    },
+runTestsWithFixtures("@definitelytyped/no-self-import", dtHeader, {
+  valid: [
     {
-      code: `import old from "./v11"`,
-      errors: [
-        {
-          column: 1,
-          endColumn: 24,
-          line: 1,
-          messageId: "useOnlyCurrentVersion",
-        },
-      ],
-      filename: "types.d.ts",
+      filename: "types/foo/index.d.ts",
     },
     {
-      code: `import old from "./v11/index"`,
-      errors: [
-        {
-          column: 1,
-          endColumn: 30,
-          line: 1,
-          messageId: "useOnlyCurrentVersion",
-        },
-      ],
-      filename: "types.d.ts",
+      filename: "types/no-self-import/index.d.ts",
     },
     {
-      code: `import old from "./v11/subdir/file"`,
-      errors: [
-        {
-          column: 1,
-          endColumn: 36,
-          line: 1,
-          messageId: "useOnlyCurrentVersion",
-        },
-      ],
-      filename: "types.d.ts",
-    },
-    {
-      code: `import old from "./v0.1"`,
-      errors: [
-        {
-          column: 1,
-          endColumn: 25,
-          line: 1,
-          messageId: "useOnlyCurrentVersion",
-        },
-      ],
-      filename: "types.d.ts",
+      filename: "types/no-self-import/no-self-import-tests.ts",
     },
+  ],
+  invalid: [
     {
-      code: `import old from "./v0.1/index"`,
+      filename: "types/no-self-import/bad.d.ts",
       errors: [
-        {
-          column: 1,
-          endColumn: 31,
-          line: 1,
-          messageId: "useOnlyCurrentVersion",
-        },
+        { messageId: "useRelativeImport" },
+        { messageId: "useRelativeImport" },
+        { messageId: "useOnlyCurrentVersion" },
+        { messageId: "useOnlyCurrentVersion" },
+        { messageId: "useOnlyCurrentVersion" },
+        { messageId: "useOnlyCurrentVersion" },
+        { messageId: "useOnlyCurrentVersion" },
       ],
-      filename: "types.d.ts",
-    },
-  ],
-  valid: [
-    {
-      code: `import other from "other-package";`,
-      filename: "types/this-package/index.d.ts",
-    },
-    {
-      code: `import other from "other-package/this-package";`,
-      filename: "types/this-package/index.d.ts",
-    },
-    {
-      code: `import myself from "this-package";`,
-      filename: "types/grandparent/this-package/index.d.ts",
-    },
-    {
-      code: `import old from "./v1gardenpath"`,
-      filename: "types.d.ts",
-    },
-    {
-      code: `import old from "./v1verb/other"`,
-      filename: "types.d.ts",
     },
   ],
 });

package/test/no-single-declare-module.test.ts

@@ -1,5 +1,4 @@
 import { ESLintUtils } from "@typescript-eslint/utils";
-import path from "path";
 
 import rule from "../src/rules/no-single-declare-module";
 

package/test/no-unnecessary-generics.test.ts

@@ -6,7 +6,7 @@ const ruleTester = new ESLintUtils.RuleTester({
   parserOptions: {
     ecmaVersion: 2018,
     tsconfigRootDir: __dirname,
-    project: "./tsconfig.json",
+    project: "./tsconfig.test.json",
   },
   parser: "@typescript-eslint/parser",
 });

package/test/tsconfig.json

@@ -1,10 +1,13 @@
 {
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "skipLibCheck": true,
-    "strict": true,
-    "target": "esnext"
+    "types": ["node", "jest"],
+    "composite": false,
+    "noEmit": true
   },
-    "files": [
-        "file.ts"
-    ]
+  "references": [
+    { "path": ".." },
+    { "path": "../../utils" }
+  ],
+  "exclude": ["fixtures"]
 }

package/test/tsconfig.test.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "esnext"
+  },
+    "files": [
+        "file.ts"
+    ]
+}

package/test/util.test.ts

@@ -1,24 +1,35 @@
-import { getTypesPackageForDeclarationFile } from "../src/util";
+import { findTypesPackage, getTypesPackageForDeclarationFile } from "../src/util";
+import { getFixturePath } from "./fixtureTester";
 
 describe("getTypesPackageForDeclarationFile", () => {
   test.each([
-    ["types/abc/index.d.ts", "abc"],
-    ["types/abc/other.d.ts", "abc"],
-    ["types/scope__abc/other.d.ts", "@scope/abc"],
-    ["types/abc/nested/index.d.ts", "abc"],
-    ["types/abc/nested/other.d.ts", "abc"],
-    ["/types/abc/index.d.ts", "abc"],
-    ["/types/abc/other.d.ts", "abc"],
-    ["/types/scope__abc/other.d.ts", "@scope/abc"],
-    ["/types/abc/nested/index.d.ts", "abc"],
-    ["/types/abc/nested/other.d.ts", "abc"],
-    ["DefinitelyTyped/types/abc/index.d.ts", "abc"],
-    ["DefinitelyTyped/types/abc/other.d.ts", "abc"],
-    ["DefinitelyTyped/types/scope__abc/other.d.ts", "@scope/abc"],
-    ["DefinitelyTyped/types/abc/nested/index.d.ts", "abc"],
-    ["DefinitelyTyped/types/abc/nested/other.d.ts", "abc"],
-    ["DefinitelyTyped/types/scope__abc/nested/other.d.ts", "@scope/abc"],
+    ["types/foo/index.d.ts", "foo"],
+    ["types/foo/foo-tests.ts", undefined],
+    ["types/foo/v1/index.d.ts", "foo"],
+    ["types/foo/v1/foo-tests.ts", undefined],
+    ["types/scoped__foo/index.d.ts", "@scoped/foo"],
+    ["types/scoped__foo/scoped__foo-tests.ts", undefined],
+    ["types/scoped__foo/v1/index.d.ts", "@scoped/foo"],
+    ["types/scoped__foo/v1/scoped__foo-tests.ts", undefined],
+    ["bad.d.ts", undefined],
   ])("%s becomes %s", (input, expected) => {
-    expect(getTypesPackageForDeclarationFile(input)).toEqual(expected);
+    expect(getTypesPackageForDeclarationFile(getFixturePath(input))).toEqual(expected);
+  });
+});
+
+describe("findTypesPackage realName", () => {
+  test.each([
+    ["types/foo/index.d.ts", "foo"],
+    ["types/foo/foo-tests.ts", "foo"],
+    ["types/foo/v1/index.d.ts", "foo"],
+    ["types/foo/v1/foo-tests.ts", "foo"],
+    ["types/scoped__foo/index.d.ts", "@scoped/foo"],
+    ["types/scoped__foo/scoped__foo-tests.ts", "@scoped/foo"],
+    ["types/scoped__foo/v1/index.d.ts", "@scoped/foo"],
+    ["types/scoped__foo/v1/scoped__foo-tests.ts", "@scoped/foo"],
+    ["bad.d.ts", undefined],
+  ])("%s becomes %s", (input, expected) => {
+    const realName = findTypesPackage(getFixturePath(input))?.realName;
+    expect(realName).toEqual(expected);
   });
 });