Improved the contract definition to consider tuple definitions

Making the emulator startup kill unavailable ports

Author: Muritavo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@muritavo/cypress-toolkit",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "A series of utility functions for working with cypress (mainly cypress Component testing)",
   "main": "dist/index.js",
   "repository": "[email protected]:Muritavo/cypress-toolkit.git",
@@ -22,6 +22,7 @@
   ],
   "devDependencies": {
     "@muritavo/webpack-microfrontend-scripts": "^0.0.22",
+    "@types/kill-port": "^2.0.0",
     "@types/react": "^18.0.14",
     "@types/spellchecker": "^3.5.0",
     "@types/webpack": "^5.28.0",

src/scripts/emulator.ts

@@ -3,6 +3,7 @@ import { spawn, ChildProcess } from "child_process";
 import { TasksArgs } from "./tasks";
 import { initializeApp } from "firebase-admin/app";
 import { getAuth } from "firebase-admin/auth";
+import killPort from "kill-port";
 
 const log = require("debug")("cypress-toolkit/emulator");
 let spawnResult: {
@@ -86,14 +87,36 @@ async function startEmulatorTask(args: TasksArgs["StartEmulatorTask"]) {
       log("Emulator start sent message", e.toString());
     });
 
+    let scriptOutput = "";
+    spawnResult.process.stdout!.on("data", function (data) {
+      data = data.toString();
+      scriptOutput += data;
+    });
+
     spawnResult.process.on("close", (e) => {
       clearTimeout(timeout);
       log("Emulator closed with", e);
-      rej(
-        new Error(
-          `Emulator closed with code ${e}. Check the firebse-debug.log for more details`
-        )
+      const unavailablePorts = args.ports.filter((p) =>
+        scriptOutput.includes(String(p))
       );
+      const failedWithUnavailablePort = unavailablePorts.length;
+      if (failedWithUnavailablePort) {
+        Promise.all(unavailablePorts.map((p) => killPort(p))).then(() => {
+          rej(
+            new Error(
+              `Some ports were unavailable (${unavailablePorts.join(
+                ", "
+              )}). They were killed, please try running the application again`
+            )
+          );
+        });
+      } else {
+        rej(
+          new Error(
+            `Emulator closed with code ${e}. Check the firebse-debug.log for more details`
+          )
+        );
+      }
       spawnResult = undefined as any;
     });
     while (!breakLoop) {

src/scripts/tasks.d.ts

@@ -11,5 +11,6 @@ export type TasksArgs = {
         databaseToImport?: string,
         UIPort: number,
         suiteId: string
+        ports: number[]
     }
 }

src/support/emulator.ts

@@ -47,6 +47,7 @@ Cypress.Commands.add(
         databaseToImport: databaseToImport,
         UIPort: emulatorConfig.emulators.ui.port || 4000,
         suiteId: suiteId || databaseToImport,
+        ports: Object.values(emulatorConfig.emulators).map(a => a.port)
       })
       .then(() => {
         sessionStorage.setItem("last-database", databaseToImport);

types/contract.d.ts

@@ -24,6 +24,7 @@ type ExtractEvents<A extends AllABIs[number]> = A extends {
 type TypeOrInternalType<T> = T['internalType'] extends unknown ? T['type'] : T['internalType']
 
 type MapTypeToJS<L, C> =
+  L extends "tuple[]" ? TuplifyUnion<C[number], C[number]['name']>[] :
   L extends "address" | "uint256" | "uint128" | "uint8" | "string" | "bytes32"
   ? string
   : L extends "bool"

yarn.lock

@@ -2926,6 +2926,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/kill-port@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/kill-port/-/kill-port-2.0.0.tgz#ba28034ace13a1444e7a3428c0a487b4e09322f2"
+  integrity sha512-AegaqABFauES4++49NeNX7TyZJ7t48t10+qJn4QGVGQqDogEk89M0iI4W0HXS+TEUk/hYAtEsgJ+6nyuSyYxlw==
+  dependencies:
+    "@types/node" "*"
+    shell-exec "^1"
+
 "@types/level-errors@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/level-errors/-/level-errors-3.0.0.tgz#15c1f4915a5ef763b51651b15e90f6dc081b96a8"
@@ -10674,6 +10682,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/shell-exec/-/shell-exec-1.0.2.tgz#2e9361b0fde1d73f476c4b6671fa17785f696756"
   integrity sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==
 
+shell-exec@^1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/shell-exec/-/shell-exec-1.1.2.tgz#d4056f96638d8406c8ab498f9f8b28938eba2dd0"
+  integrity sha512-v2NWVDP0ws+S7miKy2oSpJ/OuL6NKuMosPNUZLDWFBlMnBtuoZxZOwxpQJwhsFZgMb+r7frpDTT8p4OSnhkpsg==
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"