@definitelytyped/eslint-plugin 0.0.187 → 0.0.188

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/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);
   });
 });