Clean up a bunch of TypeScript shenanigans

Some of this was remnants of the past. Some was me not quite
understanding script vs. module. Some was me misunderstanding what was
actually going on in Tsd.

It turns out that Tsd was just incidentally working, but I was never
using it according to their intentions. You don't really test *.ts files
with Tsd [1], but I happen to place compile output along side of them,
hence "incidentally working".

Now I am merely relying on TS compiler's diagnostic output, which is
really what Tsd does anyway.

[1] tsdjs/tsd#32

.gitignore

@@ -2,10 +2,9 @@
 **/*.d.ts
 !examples/**/*
 !features/**/*
-!cucumber.d.ts
 !cucumber.js
+!augmentations.d.ts
 !declarations.d.ts
-!types/index.d.ts
 
 # Temporary directory for test execution
 tmp/

augmentations.d.ts

@@ -0,0 +1,37 @@
+import messages from "@cucumber/messages";
+
+import { Registry } from "./lib/registry";
+
+declare module "@cucumber/cucumber" {
+  interface IWorld {
+    tmpDir: string;
+    verifiedLastRunError: boolean;
+    lastRun: {
+      stdout: string;
+      stderr: string;
+      output: string;
+      exitCode: number;
+    };
+  }
+}
+
+declare global {
+  namespace globalThis {
+    var __cypress_cucumber_preprocessor_dont_use_this: true | undefined;
+
+    var __cypress_cucumber_preprocessor_registry_dont_use_this:
+      | Registry
+      | undefined;
+  }
+
+  interface Window {
+    testState: {
+      gherkinDocument: messages.GherkinDocument;
+      pickles: messages.Pickle[];
+      pickle: messages.Pickle;
+      pickleStep?: messages.PickleStep;
+    };
+  }
+}
+
+export {};

lib/add-cucumber-preprocessor-plugin.ts

@@ -47,18 +47,6 @@ import { ensureIsAbsolute } from "./helpers/paths";
 
 import { createTimestamp } from "./messages-helpers";
 
-/**
- * Work-around for the fact that some Cypress versions pre v10 were missing this property in their types.
- */
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Cypress {
-    interface PluginConfigOptions {
-      testFiles: string[];
-    }
-  }
-}
-
 function memoize<T extends (...args: any[]) => any>(
   fn: T
 ): (...args: Parameters<T>) => ReturnType<T> {

lib/create-tests.ts

@@ -53,14 +53,6 @@ import { generateSnippet } from "./snippets";
 
 import { runStepWithLogGroup } from "./cypress";
 
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace globalThis {
-    // eslint-disable-next-line no-var
-    var __cypress_cucumber_preprocessor_dont_use_this: true | undefined;
-  }
-}
-
 type Node = ReturnType<typeof parse>;
 
 interface CompositionContext {

lib/index.ts

@@ -1,5 +1,3 @@
-import messages from "@cucumber/messages";
-
 import DataTable from "./data_table";
 
 import {
@@ -8,17 +6,6 @@ import {
   IStepDefinitionBody,
 } from "./types";
 
-declare global {
-  interface Window {
-    testState: {
-      gherkinDocument: messages.GherkinDocument;
-      pickles: messages.Pickle[];
-      pickle: messages.Pickle;
-      pickleStep?: messages.PickleStep;
-    };
-  }
-}
-
 export { resolve as resolvePreprocessorConfiguration } from "./preprocessor-configuration";
 
 export {

lib/registry.ts

@@ -229,16 +229,6 @@ export class Registry {
   }
 }
 
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace globalThis {
-    // eslint-disable-next-line no-var
-    var __cypress_cucumber_preprocessor_registry_dont_use_this:
-      | Registry
-      | undefined;
-  }
-}
-
 const globalPropertyName =
   "__cypress_cucumber_preprocessor_registry_dont_use_this";
 
@@ -261,7 +251,7 @@ export function freeRegistry() {
   delete globalThis[globalPropertyName];
 }
 
-export function getRegistry() {
+export function getRegistry(): Registry {
   return assertAndReturn(
     globalThis[globalPropertyName],
     "Expected to find a global registry (this usually means you are trying to define steps or hooks in support/e2e.js, which is not supported)"

package.json

@@ -39,7 +39,7 @@
     "test": "npm run test:fmt && npm run test:lint && npm run test:types && npm run test:unit && npm run test:integration",
     "test:fmt": "prettier --ignore-path .gitignore --check '**/*.ts'",
     "test:lint": "eslint .",
-    "test:types": "tsd",
+    "test:types": "tsc -p test-d",
     "test:unit": "mocha lib/**/*.test.ts",
     "test:run-all-specs": "mocha --timeout 0 test/run-all-specs.ts",
     "test:integration": "cucumber-js",

lib/index.test-d.ts → test-d/methods.test-d.ts

@@ -2,8 +2,6 @@ import { expectType } from "tsd";
 
 import messages from "@cucumber/messages";
 
-import "./";
-
 import {
   Given,
   When,

test-d/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": [
+    "*.test-d.ts",
+    "../augmentations.d.ts",
+    "../declarations.d.ts",
+  ]
+}

tsconfig.json

@@ -16,12 +16,11 @@
   },
   "include": [
     "lib/**/*.ts",
-    "test/**/*.ts",
     "methods.ts",
+    "augmentations.d.ts",
     "declarations.d.ts",
     "browserify.ts",
     "esbuild.ts",
     "webpack.ts"
-  ],
-  "exclude": ["lib/index.test-d.ts"]
+  ]
 }