Make test-types work with tsc and XO

novemberborn · novemberborn · commit 5a9a6271c019 · 2023-07-03T15:46:29.000+02:00
This used to work… but didn't for the new timout tests.
diff --git a/entrypoints/main.d.mts b/entrypoints/main.d.mts
diff --git a/entrypoints/plugin.d.mts b/entrypoints/plugin.d.mts
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
 	"exports": {
 		".": {
 			"import": {
-				"types": "./entrypoints/main.d.ts",
+				"types": "./entrypoints/main.d.mts",
 				"default": "./entrypoints/main.mjs"
 			},
 			"require": {
@@ -22,7 +22,7 @@
 		"./eslint-plugin-helper": "./entrypoints/eslint-plugin-helper.cjs",
 		"./plugin": {
 			"import": {
-				"types": "./entrypoints/plugin.d.ts",
+				"types": "./entrypoints/plugin.d.mts",
 				"default": "./entrypoints/plugin.mjs"
 			},
 			"require": {
diff --git a/test-types/import-in-cts/assertions-as-type-guards.cts b/test-types/import-in-cts/assertions-as-type-guards.cts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 import {expectType} from 'tsd';
 
 type Expected = {foo: 'bar'};
diff --git a/test-types/import-in-cts/context.cts b/test-types/import-in-cts/context.cts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import anyTest, {ExecutionContext, TestFn} from 'ava';
+import anyTest, {ExecutionContext, TestFn} from '../../entrypoints/main.cjs';
 import {expectError, expectType} from 'tsd';
 
 interface Context {
diff --git a/test-types/import-in-cts/deep-equal.cts b/test-types/import-in-cts/deep-equal.cts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 import {expectType} from 'tsd';
 
 test('actual extends expected', t => {
diff --git a/test-types/import-in-cts/implementation-result.cts b/test-types/import-in-cts/implementation-result.cts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 
 test.after('return anything else', _t => ({
 	foo: 'bar',
diff --git a/test-types/import-in-cts/like.cts b/test-types/import-in-cts/like.cts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 
 test('like', t => {
 	t.like({
diff --git a/test-types/import-in-cts/macros.cts b/test-types/import-in-cts/macros.cts
@@ -1,5 +1,5 @@
 /* eslint-disable no-lone-blocks */
-import test, {ExecutionContext} from 'ava';
+import test, {ExecutionContext} from '../../entrypoints/main.cjs';
 import {expectType} from 'tsd';
 
 // Typed arguments through generics.
diff --git a/test-types/import-in-cts/snapshot.cts b/test-types/import-in-cts/snapshot.cts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 import {expectError} from 'tsd';
 
 test('snapshot', t => {
diff --git a/test-types/import-in-cts/teardown.cts b/test-types/import-in-cts/teardown.cts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 
 test('test', t => {
 	t.teardown(() => {}); // eslint-disable-line @typescript-eslint/no-empty-function
diff --git a/test-types/import-in-cts/throws.cts b/test-types/import-in-cts/throws.cts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import test from 'ava';
+import test from '../../entrypoints/main.cjs';
 import {expectType} from 'tsd';
 
 class CustomError extends Error {
diff --git a/test-types/import-in-cts/try-commit.cts b/test-types/import-in-cts/try-commit.cts
@@ -1,4 +1,4 @@
-import test, {ExecutionContext} from 'ava';
+import test, {ExecutionContext} from '../../entrypoints/main.cjs';
 import {expectType} from 'tsd';
 
 test('attempt', async t => {
diff --git a/test-types/module/assertions-as-type-guards.ts b/test-types/module/assertions-as-type-guards.ts
@@ -1,6 +1,7 @@
-import test from 'ava';
 import {expectType} from 'tsd';
 
+import test from '../../entrypoints/main.mjs';
+
 type Expected = {foo: 'bar'};
 const expected: Expected = {foo: 'bar'};
 
diff --git a/test-types/module/context.ts b/test-types/module/context.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import type {ExecutionContext, TestFn} from 'ava';
-import anyTest from 'ava';
 import {expectError, expectType} from 'tsd';
 
+import type {ExecutionContext, TestFn} from '../../entrypoints/main.mjs';
+import anyTest from '../../entrypoints/main.mjs';
+
 type Context = {
 	foo: string;
 };
diff --git a/test-types/module/deep-equal.ts b/test-types/module/deep-equal.ts
@@ -1,6 +1,7 @@
-import test from 'ava';
 import {expectType} from 'tsd';
 
+import test from '../../entrypoints/main.mjs';
+
 test('actual extends expected', t => {
 	type Expected = {foo: [1, 2, 3]};
 	const expected: Expected = {foo: [1, 2, 3]};
diff --git a/test-types/module/implementation-result.ts b/test-types/module/implementation-result.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import test from 'ava';
+import test from '../../entrypoints/main.mjs';
 
 test.after('return anything else', _t => ({
 	foo: 'bar',
diff --git a/test-types/module/like.ts b/test-types/module/like.ts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.mjs';
 
 test('like', t => {
 	t.like({
diff --git a/test-types/module/macros.ts b/test-types/module/macros.ts
@@ -1,7 +1,8 @@
-import type {ExecutionContext} from 'ava';
-import test from 'ava';
 import {expectType} from 'tsd';
 
+import type {ExecutionContext} from '../../entrypoints/main.mjs';
+import test from '../../entrypoints/main.mjs';
+
 // Typed arguments through generics.
 {
 	const hasLength = test.macro<[string, number]>((t, input, expected) => {
@@ -118,7 +119,7 @@ test('has length 3 (inferred)', (t, input, expected) => {
 	t.is(input, expected);
 }, 'foo', 3);
 
-test.skip('skip', (t, input, expected) => { // eslint-disable-line ava/no-skip-test
+test.skip('skip', (t, input, expected) => {
 	expectType<string>(input);
 	expectType<number>(expected);
 	// @ts-expect-error TS2345
diff --git a/test-types/module/snapshot.ts b/test-types/module/snapshot.ts
@@ -1,6 +1,7 @@
-import test from 'ava';
 import {expectError} from 'tsd';
 
+import test from '../../entrypoints/main.mjs';
+
 test('snapshot', t => {
 	t.snapshot({foo: 'bar'});
 	t.snapshot(null, 'a snapshot with a message');
diff --git a/test-types/module/teardown.ts b/test-types/module/teardown.ts
@@ -1,4 +1,4 @@
-import test from 'ava';
+import test from '../../entrypoints/main.mjs';
 
 test('test', t => {
 	t.teardown(() => {}); // eslint-disable-line @typescript-eslint/no-empty-function
diff --git a/test-types/module/throws.ts b/test-types/module/throws.ts
@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import test from 'ava';
 import {expectType} from 'tsd';
 
+import test from '../../entrypoints/main.mjs';
+
 class CustomError extends Error {
 	foo: string;
 
diff --git a/test-types/module/try-commit.ts b/test-types/module/try-commit.ts
@@ -1,7 +1,8 @@
-import type {ExecutionContext} from 'ava';
-import test from 'ava';
 import {expectType} from 'tsd';
 
+import type {ExecutionContext} from '../../entrypoints/main.mjs';
+import test from '../../entrypoints/main.mjs';
+
 test('attempt', async t => {
 	const attempt = await t.try(
 		(u, a, b) => {
@@ -55,11 +56,11 @@ test('all possible variants to pass to t.try', async t => {
 	void t.try('test', (tt, a, b) => tt.is(a.length, b), 'hello', 5);
 
 	// Macro with title
-	const macro1 = test.macro<[string, number]>({ // eslint-disable-line ava/no-nested-tests
+	const macro1 = test.macro<[string, number]>({
 		exec: (tt, a, b) => tt.is(a.length, b),
 		title: (title, a, b) => `${title ? `${String(title)} ` : ''}str: "${String(a)}" with len: "${String(b)}"`,
 	});
-	const macro2 = test.macro<[string, number]>((tt, a, b) => { // eslint-disable-line ava/no-nested-tests
+	const macro2 = test.macro<[string, number]>((tt, a, b) => {
 		tt.is(a.slice(b), '');
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import test from 'ava';`
	`1`	`+import test from '../../entrypoints/main.cjs';`
`2`	`2`	`import {expectType} from 'tsd';`
`3`	`3`
`4`	`4`	`type Expected = {foo: 'bar'};`