@capraconsulting/cals-cli 3.6.0 → 3.7.1

package/lib/index.js

@@ -1,88 +1,48 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import rimraf from 'rimraf';
+import chalk from 'chalk';
+import readline from 'readline';
+import 'util';
+import cachedir from 'cachedir';
+import https from 'https';
+import os from 'os';
+import AJV from 'ajv';
+import yaml from 'js-yaml';
+import { uniq } from 'lodash-es';
+import { Octokit } from '@octokit/rest';
+import fetch from 'node-fetch';
+import pLimit from 'p-limit';
+import keytar from 'keytar';
+import * as process$1 from 'process';
+import { performance } from 'perf_hooks';
+import { strict } from 'assert';
+import execa from 'execa';
+import read from 'read';
+import { Transform } from 'stream';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var fs = require('fs');
-var path = require('path');
-var rimraf = require('rimraf');
-var chalk = require('chalk');
-var readline = require('readline');
-require('util');
-var cachedir = require('cachedir');
-var https = require('https');
-var os = require('os');
-var AJV = require('ajv');
-var yaml = require('js-yaml');
-var lodash = require('lodash');
-var rest = require('@octokit/rest');
-var fetch = require('node-fetch');
-var pLimit = require('p-limit');
-var keytar = require('keytar');
-var process$1 = require('process');
-var perf_hooks = require('perf_hooks');
-var assert = require('assert');
-var execa = require('execa');
-var read = require('read');
-var stream = require('stream');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var rimraf__default = /*#__PURE__*/_interopDefaultLegacy(rimraf);
-var chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
-var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
-var cachedir__default = /*#__PURE__*/_interopDefaultLegacy(cachedir);
-var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
-var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
-var AJV__default = /*#__PURE__*/_interopDefaultLegacy(AJV);
-var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
-var pLimit__default = /*#__PURE__*/_interopDefaultLegacy(pLimit);
-var keytar__default = /*#__PURE__*/_interopDefaultLegacy(keytar);
-var process__namespace = /*#__PURE__*/_interopNamespace(process$1);
-var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
-var read__default = /*#__PURE__*/_interopDefaultLegacy(read);
-
-var version = "3.6.0";
+var version = "3.7.1";
 
 class CacheProvider {
     constructor(config) {
-        this.mustValidate = false;
-        this.defaultCacheTime = 1800;
         this.config = config;
     }
+    mustValidate = false;
+    config;
+    defaultCacheTime = 1800;
     /**
      * Retrieve cache if existent, ignoring the time.
      *
      * The caller is responsible for handling proper validation,
      */
     retrieveJson(cachekey) {
-        const cachefile = path__default["default"].join(this.config.cacheDir, `${cachekey}.json`);
-        if (!fs__default["default"].existsSync(cachefile)) {
+        const cachefile = path.join(this.config.cacheDir, `${cachekey}.json`);
+        if (!fs.existsSync(cachefile)) {
             return undefined;
         }
-        const data = fs__default["default"].readFileSync(cachefile, "utf-8");
+        const data = fs.readFileSync(cachefile, "utf-8");
         return {
-            cacheTime: fs__default["default"].statSync(cachefile).mtime.getTime(),
+            cacheTime: fs.statSync(cachefile).mtime.getTime(),
             data: (data === "undefined" ? undefined : JSON.parse(data)),
         };
     }
@@ -90,11 +50,11 @@ class CacheProvider {
      * Save data to cache.
      */
     storeJson(cachekey, data) {
-        const cachefile = path__default["default"].join(this.config.cacheDir, `${cachekey}.json`);
-        if (!fs__default["default"].existsSync(this.config.cacheDir)) {
-            fs__default["default"].mkdirSync(this.config.cacheDir, { recursive: true });
+        const cachefile = path.join(this.config.cacheDir, `${cachekey}.json`);
+        if (!fs.existsSync(this.config.cacheDir)) {
+            fs.mkdirSync(this.config.cacheDir, { recursive: true });
         }
-        fs__default["default"].writeFileSync(cachefile, data === undefined ? "undefined" : JSON.stringify(data));
+        fs.writeFileSync(cachefile, data === undefined ? "undefined" : JSON.stringify(data));
     }
     async json(cachekey, block, cachetime = this.defaultCacheTime) {
         const cacheItem = this.mustValidate
@@ -112,26 +72,28 @@ class CacheProvider {
      * Delete all cached data.
      */
     cleanup() {
-        rimraf__default["default"].sync(this.config.cacheDir);
+        rimraf.sync(this.config.cacheDir);
     }
 }
 
 const CLEAR_WHOLE_LINE = 0;
 function clearLine(stdout) {
-    readline__default["default"].clearLine(stdout, CLEAR_WHOLE_LINE);
-    readline__default["default"].cursorTo(stdout, 0);
+    readline.clearLine(stdout, CLEAR_WHOLE_LINE);
+    readline.cursorTo(stdout, 0);
 }
 class Reporter {
     constructor(opts = {}) {
-        this.stdout = process.stdout;
-        this.stderr = process.stderr;
-        this.stdin = process.stdin;
-        this.isTTY = this.stdout.isTTY;
-        this.format = chalk__default["default"];
-        this.startTime = Date.now();
         this.nonInteractive = !!opts.nonInteractive;
         this.isVerbose = !!opts.verbose;
     }
+    stdout = process.stdout;
+    stderr = process.stderr;
+    stdin = process.stdin;
+    isTTY = this.stdout.isTTY;
+    nonInteractive;
+    isVerbose;
+    format = chalk;
+    startTime = Date.now();
     error(msg) {
         clearLine(this.stderr);
         this.stderr.write(`${this.format.red("error")} ${msg}\n`);
@@ -155,15 +117,13 @@ class Reporter {
 }
 
 class Config {
-    constructor() {
-        this.cwd = path__default["default"].resolve(process.cwd());
-        this.configFile = path__default["default"].join(os__default["default"].homedir(), ".cals-config.json");
-        this.cacheDir = cachedir__default["default"]("cals-cli");
-        this.agent = new https__default["default"].Agent({
-            keepAlive: true,
-        });
-        this.configCached = undefined;
-    }
+    cwd = path.resolve(process.cwd());
+    configFile = path.join(os.homedir(), ".cals-config.json");
+    cacheDir = cachedir("cals-cli");
+    agent = new https.Agent({
+        keepAlive: true,
+    });
+    configCached = undefined;
     get config() {
         const existingConfig = this.configCached;
         if (existingConfig !== undefined) {
@@ -174,12 +134,12 @@ class Config {
         return config;
     }
     readConfig() {
-        if (!fs__default["default"].existsSync(this.configFile)) {
+        if (!fs.existsSync(this.configFile)) {
             return {};
         }
         try {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return JSON.parse(fs__default["default"].readFileSync(this.configFile, "utf-8"));
+            return JSON.parse(fs.readFileSync(this.configFile, "utf-8"));
         }
         catch (e) {
             console.error("Failed", e);
@@ -201,7 +161,7 @@ class Config {
             ...this.readConfig(),
             [key]: value, // undefined will remove
         };
-        fs__default["default"].writeFileSync(this.configFile, JSON.stringify(updatedConfig, null, "  "));
+        fs.writeFileSync(this.configFile, JSON.stringify(updatedConfig, null, "  "));
         this.configCached = updatedConfig;
     }
 }
@@ -507,12 +467,11 @@ function getRepoId(orgName, repoName) {
     return `${orgName}/${repoName}`;
 }
 function checkAgainstSchema(value) {
-    var _a;
-    const ajv = new AJV__default["default"]({ allErrors: true });
+    const ajv = new AJV({ allErrors: true });
     const valid = ajv.validate(schema, value);
     return valid
         ? { definition: value }
-        : { error: (_a = ajv.errorsText()) !== null && _a !== void 0 ? _a : "Unknown error" };
+        : { error: ajv.errorsText() ?? "Unknown error" };
 }
 function requireValidDefinition(definition) {
     // Verify no duplicates in users and extract known logins.
@@ -557,7 +516,8 @@ function requireValidDefinition(definition) {
                 if (!teamIdList.includes(id)) {
                     throw new Error(`Project team ${id} in project ${project.name} is not registered in team list`);
                 }
-            });
+            }) // Verify repo teams exists as teams.
+            ;
             (org.repos || []).forEach((repo) => {
                 (repo.teams || []).forEach((team) => {
                     const id = getTeamId(org.organization, team.name);
@@ -581,11 +541,12 @@ function requireValidDefinition(definition) {
     }, []);
 }
 class DefinitionFile {
+    path;
     constructor(path) {
         this.path = path;
     }
     async getContents() {
-        return new Promise((resolve, reject) => fs__default["default"].readFile(this.path, "utf-8", (err, data) => {
+        return new Promise((resolve, reject) => fs.readFile(this.path, "utf-8", (err, data) => {
             if (err)
                 reject(err);
             else
@@ -597,7 +558,7 @@ class DefinitionFile {
     }
 }
 function parseDefinition(value) {
-    const result = checkAgainstSchema(yaml__default["default"].load(value));
+    const result = checkAgainstSchema(yaml.load(value));
     if ("error" in result) {
         throw new Error("Definition content invalid: " + result.error);
     }
@@ -615,7 +576,7 @@ function getRepos(definition) {
         .flat());
 }
 function getGitHubOrgs(definition) {
-    return lodash.uniq(definition.projects.flatMap((project) => project.github.map((it) => it.organization)));
+    return uniq(definition.projects.flatMap((project) => project.github.map((it) => it.organization)));
 }
 
 function createReporter(argv) {
@@ -626,15 +587,13 @@ function createReporter(argv) {
 }
 
 class GitHubTokenCliProvider {
-    constructor() {
-        this.keyringService = "cals";
-        this.keyringAccount = "github-token";
-    }
+    keyringService = "cals";
+    keyringAccount = "github-token";
     async getToken() {
         if (process.env.CALS_GITHUB_TOKEN) {
             return process.env.CALS_GITHUB_TOKEN;
         }
-        const result = await keytar__default["default"].getPassword(this.keyringService, this.keyringAccount);
+        const result = await keytar.getPassword(this.keyringService, this.keyringAccount);
         if (result == null) {
             process.stderr.write("No token found. Register using `cals github set-token`\n");
             return undefined;
@@ -642,10 +601,10 @@ class GitHubTokenCliProvider {
         return result;
     }
     async markInvalid() {
-        await keytar__default["default"].deletePassword(this.keyringService, this.keyringAccount);
+        await keytar.deletePassword(this.keyringService, this.keyringAccount);
     }
     async setToken(value) {
-        await keytar__default["default"].setPassword(this.keyringService, this.keyringAccount, value);
+        await keytar.setPassword(this.keyringService, this.keyringAccount, value);
     }
 }
 
@@ -665,15 +624,19 @@ async function undefinedForNotFound(value) {
 }
 
 class GitHubService {
+    config;
+    octokit;
+    cache;
+    tokenProvider;
+    semaphore;
     constructor(props) {
-        this._requestCount = 0;
         this.config = props.config;
         this.octokit = props.octokit;
         this.cache = props.cache;
         this.tokenProvider = props.tokenProvider;
         // Control concurrency to GitHub API at service level so we
         // can maximize concurrency all other places.
-        this.semaphore = pLimit__default["default"](6);
+        this.semaphore = pLimit(6);
         this.octokit.hook.wrap("request", async (request, options) => {
             /* eslint-disable @typescript-eslint/no-unsafe-member-access */
             this._requestCount++;
@@ -739,6 +702,7 @@ class GitHubService {
             /* eslint-enable @typescript-eslint/no-unsafe-member-access */
         });
     }
+    _requestCount = 0;
     get requestCount() {
         return this._requestCount;
     }
@@ -753,18 +717,18 @@ class GitHubService {
         };
         let requestDuration = -1;
         const response = await this.semaphore(() => {
-            const requestStart = perf_hooks.performance.now();
-            const result = fetch__default["default"](url, {
+            const requestStart = performance.now();
+            const result = fetch(url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify({ query }),
                 agent: this.config.agent,
             });
-            requestDuration = perf_hooks.performance.now() - requestStart;
+            requestDuration = performance.now() - requestStart;
             return result;
         });
         if (response.status === 401) {
-            process__namespace.stderr.write("Unauthorized\n");
+            process$1.stderr.write("Unauthorized\n");
             await this.tokenProvider.markInvalid();
         }
         // If you get 502 after 10s, it is a timeout.
@@ -857,15 +821,12 @@ class GitHubService {
                 login: it.login,
                 data: it,
             })),
-            ...(await this.getOrgMembersInvitedList(org)).map((it) => {
-                var _a;
-                return ({
-                    type: "invited",
-                    // TODO: Fix ?? case properly
-                    login: (_a = it.login) !== null && _a !== void 0 ? _a : "invalid",
-                    data: it,
-                });
-            }),
+            ...(await this.getOrgMembersInvitedList(org)).map((it) => ({
+                type: "invited",
+                // TODO: Fix ?? case properly
+                login: it.login ?? "invalid",
+                data: it,
+            })),
         ];
     }
     async getRepository(owner, repo) {
@@ -934,15 +895,12 @@ class GitHubService {
                 login: it.login,
                 data: it,
             })),
-            ...(await this.getTeamMemberInvitedList(org, team)).map((it) => {
-                var _a;
-                return ({
-                    type: "invited",
-                    // TODO: Fix ?? case properly
-                    login: (_a = it.login) !== null && _a !== void 0 ? _a : "invalid",
-                    data: it,
-                });
-            }),
+            ...(await this.getTeamMemberInvitedList(org, team)).map((it) => ({
+                type: "invited",
+                // TODO: Fix ?? case properly
+                login: it.login ?? "invalid",
+                data: it,
+            })),
         ];
     }
     async getSearchedPullRequestList(owner) {
@@ -1067,17 +1025,16 @@ class GitHubService {
   }
 }`;
         return this.cache.json(`vulnerability-alerts-${owner}-${repo}`, async () => {
-            var _a, _b, _c, _d, _e;
             const result = [];
             let after = null;
             while (true) {
                 const query = getQuery(after);
                 const res = await this.runGraphqlQuery(query);
-                result.push(...((_c = (_b = (_a = res.repository) === null || _a === void 0 ? void 0 : _a.vulnerabilityAlerts.edges) === null || _b === void 0 ? void 0 : _b.map((it) => it.node)) !== null && _c !== void 0 ? _c : []));
-                if (!((_d = res.repository) === null || _d === void 0 ? void 0 : _d.vulnerabilityAlerts.pageInfo.hasNextPage)) {
+                result.push(...(res.repository?.vulnerabilityAlerts.edges?.map((it) => it.node) ?? []));
+                if (!res.repository?.vulnerabilityAlerts.pageInfo.hasNextPage) {
                     break;
                 }
-                after = (_e = res.repository) === null || _e === void 0 ? void 0 : _e.vulnerabilityAlerts.pageInfo.endCursor;
+                after = res.repository?.vulnerabilityAlerts.pageInfo.endCursor;
             }
             return result;
         });
@@ -1119,27 +1076,23 @@ class GitHubService {
   }
 }`;
         const issues = await this.cache.json(`renovate-bot-issues-${owner}-${repo}`, async () => {
-            var _a, _b, _c, _d, _e;
             const result = [];
             let after = null;
             while (true) {
                 const query = getQuery(after);
                 const res = await this.runGraphqlQuery(query);
-                const nodes = (_c = (_b = (_a = res.repository) === null || _a === void 0 ? void 0 : _a.issues.edges) === null || _b === void 0 ? void 0 : _b.map((it) => it.node)) !== null && _c !== void 0 ? _c : [];
+                const nodes = res.repository?.issues.edges?.map((it) => it.node) ?? [];
                 result.push(...nodes
                     .filter((it) => it.title === "Dependency Dashboard")
-                    .map((it) => {
-                    var _a, _b, _c, _d, _e;
-                    return ({
-                        number: it.number,
-                        body: it.body,
-                        lastUpdatedByRenovate: (_e = (_d = (_c = (_b = (_a = it.userContentEdits) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b.filter((it) => { var _a; return ((_a = it.editor) === null || _a === void 0 ? void 0 : _a.login) === "renovate"; })) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.createdAt) !== null && _e !== void 0 ? _e : null,
-                    });
-                }));
-                if (!((_d = res.repository) === null || _d === void 0 ? void 0 : _d.issues.pageInfo.hasNextPage)) {
+                    .map((it) => ({
+                    number: it.number,
+                    body: it.body,
+                    lastUpdatedByRenovate: it.userContentEdits?.nodes?.filter((it) => it.editor?.login === "renovate")?.[0]?.createdAt ?? null,
+                })));
+                if (!res.repository?.issues.pageInfo.hasNextPage) {
                     break;
                 }
-                after = (_e = res.repository) === null || _e === void 0 ? void 0 : _e.issues.pageInfo.endCursor;
+                after = res.repository?.issues.pageInfo.endCursor;
             }
             return result;
         });
@@ -1150,7 +1103,7 @@ class GitHubService {
     }
 }
 async function createOctokit(config, tokenProvider) {
-    return new rest.Octokit({
+    return new Octokit({
         auth: await tokenProvider.getToken(),
         request: {
             agent: config.agent,
@@ -1158,8 +1111,7 @@ async function createOctokit(config, tokenProvider) {
     });
 }
 async function createGitHubService(props) {
-    var _a;
-    const tokenProvider = (_a = props.tokenProvider) !== null && _a !== void 0 ? _a : new GitHubTokenCliProvider();
+    const tokenProvider = props.tokenProvider ?? new GitHubTokenCliProvider();
     return new GitHubService({
         config: props.config,
         octokit: await createOctokit(props.config, tokenProvider),
@@ -1184,15 +1136,13 @@ var index$2 = /*#__PURE__*/Object.freeze({
 });
 
 class SnykTokenCliProvider {
-    constructor() {
-        this.keyringService = "cals";
-        this.keyringAccount = "snyk-token";
-    }
+    keyringService = "cals";
+    keyringAccount = "snyk-token";
     async getToken() {
         if (process.env.CALS_SNYK_TOKEN) {
             return process.env.CALS_SNYK_TOKEN;
         }
-        const result = await keytar__default["default"].getPassword(this.keyringService, this.keyringAccount);
+        const result = await keytar.getPassword(this.keyringService, this.keyringAccount);
         if (result == null) {
             process.stderr.write("No token found. Register using `cals snyk set-token`\n");
             return undefined;
@@ -1200,21 +1150,22 @@ class SnykTokenCliProvider {
         return result;
     }
     async markInvalid() {
-        await keytar__default["default"].deletePassword(this.keyringService, this.keyringAccount);
+        await keytar.deletePassword(this.keyringService, this.keyringAccount);
     }
     async setToken(value) {
-        await keytar__default["default"].setPassword(this.keyringService, this.keyringAccount, value);
+        await keytar.setPassword(this.keyringService, this.keyringAccount, value);
     }
 }
 
 class SnykService {
+    config;
+    tokenProvider;
     constructor(props) {
         this.config = props.config;
         this.tokenProvider = props.tokenProvider;
     }
     async getProjects(definition) {
-        var _a;
-        const snykAccountId = (_a = definition.snyk) === null || _a === void 0 ? void 0 : _a.accountId;
+        const snykAccountId = definition.snyk?.accountId;
         if (snykAccountId === undefined) {
             return [];
         }
@@ -1242,7 +1193,7 @@ class SnykService {
          * We continue calling the Snyk API and retrieving more projects until links.next is null
          * */
         while (nextUrl) {
-            const response = await fetch__default["default"](`https://api.snyk.io/rest${nextUrl}`, {
+            const response = await fetch(`https://api.snyk.io/rest${nextUrl}`, {
                 method: "GET",
                 headers: {
                     Accept: "application/json",
@@ -1279,7 +1230,7 @@ class SnykService {
                         totalDependencies: project.meta.latest_dependency_total.total,
                         issueCountsBySeverity: project.meta.latest_issue_counts,
                         lastTestedDate: project.meta.latest_dependency_total.updated_at,
-                        browseUrl: `https://app.snyk.io/org/${snykOrgSlugId !== null && snykOrgSlugId !== void 0 ? snykOrgSlugId : "it"}/project/${project.id}`,
+                        browseUrl: `https://app.snyk.io/org/${snykOrgSlugId ?? "it"}/project/${project.id}`,
                     };
                 }),
             ];
@@ -1291,10 +1242,9 @@ class SnykService {
     }
 }
 function createSnykService(props) {
-    var _a;
     return new SnykService({
         config: props.config,
-        tokenProvider: (_a = props.tokenProvider) !== null && _a !== void 0 ? _a : new SnykTokenCliProvider(),
+        tokenProvider: props.tokenProvider ?? new SnykTokenCliProvider(),
     });
 }
 
@@ -1352,6 +1302,8 @@ class SonarCloudTokenCliProvider {
 }
 
 class SonarCloudService {
+    config;
+    tokenProvider;
     constructor(props) {
         this.config = props.config;
         this.tokenProvider = props.tokenProvider;
@@ -1365,7 +1317,7 @@ class SonarCloudService {
         if (token === undefined) {
             throw new Error("Missing token for SonarCloud");
         }
-        const response = await fetch__default["default"](`https://sonarcloud.io/api/measures/component?component=${encodeURIComponent(sonarCloudProjectKey)}&metricKeys=coverage`, {
+        const response = await fetch(`https://sonarcloud.io/api/measures/component?component=${encodeURIComponent(sonarCloudProjectKey)}&metricKeys=coverage`, {
             method: "GET",
             headers: {
                 Accept: "application/json",
@@ -1388,10 +1340,9 @@ class SonarCloudService {
     }
 }
 function createSonarCloudService(props) {
-    var _a;
     return new SonarCloudService({
         config: props.config,
-        tokenProvider: (_a = props.tokenProvider) !== null && _a !== void 0 ? _a : new SonarCloudTokenCliProvider(),
+        tokenProvider: props.tokenProvider ?? new SonarCloudTokenCliProvider(),
     });
 }
 
@@ -1403,12 +1354,10 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 class TestExecutor {
-    constructor() {
-        this.shutdown = false;
-        this.cleanupTask = null;
-        this.usingWithCleanupTasks = false;
-        this.tasks = [];
-    }
+    shutdown = false;
+    cleanupTask = null;
+    usingWithCleanupTasks = false;
+    tasks = [];
     /**
      * Check if we are currently in shutdown state due to user
      * asking to abort (Ctrl+C).
@@ -1455,7 +1404,7 @@ class TestExecutor {
      */
     async runWithCleanupTasks(body) {
         try {
-            assert.strict.strictEqual(this.usingWithCleanupTasks, false);
+            strict.strictEqual(this.usingWithCleanupTasks, false);
             this.usingWithCleanupTasks = true;
             // We capture Ctrl+C so that we can perform cleanup task,
             // since the cleanup tasks involve async code which is not
@@ -1526,8 +1475,8 @@ function generateName(extra) {
 async function createNetwork(executor) {
     executor.checkCanContinue();
     const networkName = generateName();
-    await execa__default["default"]("docker", ["network", "create", networkName]);
-    const lsRes = await execa__default["default"]("docker", [
+    await execa("docker", ["network", "create", networkName]);
+    const lsRes = await execa("docker", [
         "network",
         "ls",
         "-q",
@@ -1537,7 +1486,7 @@ async function createNetwork(executor) {
     const networkId = lsRes.stdout.trim();
     console.log(`Network ${networkName} (${networkId}) created`);
     executor.registerCleanupTask(async () => {
-        await execa__default["default"]("docker", ["network", "rm", networkId]);
+        await execa("docker", ["network", "rm", networkId]);
         console.log(`Network ${networkName} (${networkId}) deleted`);
     });
     return {
@@ -1549,7 +1498,7 @@ async function createNetwork(executor) {
  */
 async function curl(executor, network, ...args) {
     executor.checkCanContinue();
-    const result = await execa__default["default"]("docker", [
+    const result = await execa("docker", [
         "run",
         "-i",
         "--rm",
@@ -1572,9 +1521,9 @@ async function pollForCondition({ container, attempts, waitIntervalSec, conditio
     }
     container.executor.checkCanContinue();
     log(`Waiting for condition.. Checking ${attempts} times by ${waitIntervalSec} sec`);
-    const start = perf_hooks.performance.now();
+    const start = performance.now();
     const duration = () => {
-        const end = perf_hooks.performance.now();
+        const end = performance.now();
         return Math.round((end - start) / 1000);
     };
     for (let i = 0; i < attempts; i++) {
@@ -1614,7 +1563,7 @@ async function waitForPostgresAvailable({ container, attempts = 30, waitInterval
         attempts,
         waitIntervalSec,
         condition: async () => {
-            await execa__default["default"]("docker", [
+            await execa("docker", [
                 "exec",
                 "-e",
                 `PGPASSWORD=${password}`,
@@ -1635,7 +1584,7 @@ async function waitForPostgresAvailable({ container, attempts = 30, waitInterval
 async function isRunning(executor, container) {
     executor.checkCanContinue();
     try {
-        await execa__default["default"]("docker", ["inspect", container.name]);
+        await execa("docker", ["inspect", container.name]);
         return true;
     }
     catch {
@@ -1647,7 +1596,7 @@ async function isRunning(executor, container) {
  * and also forces every chunk to end with a newline so that
  * it can be interleaved with other output.
  */
-class OutputPrefixTransform extends stream.Transform {
+class OutputPrefixTransform extends Transform {
     constructor(prefix) {
         super({
             objectMode: true,
@@ -1670,9 +1619,12 @@ class OutputPrefixTransform extends stream.Transform {
     }
 }
 function pipeToConsole(result, name) {
-    var _a, _b;
-    (_a = result.stdout) === null || _a === void 0 ? void 0 : _a.pipe(new OutputPrefixTransform(`${name}: `)).pipe(process.stdout);
-    (_b = result.stderr) === null || _b === void 0 ? void 0 : _b.pipe(new OutputPrefixTransform(`${name} (stderr): `)).pipe(process.stderr);
+    result.stdout
+        ?.pipe(new OutputPrefixTransform(`${name}: `))
+        .pipe(process.stdout);
+    result.stderr
+        ?.pipe(new OutputPrefixTransform(`${name} (stderr): `))
+        .pipe(process.stderr);
 }
 function checkPidRunning(pid) {
     try {
@@ -1690,14 +1642,14 @@ async function getContainerId({ executor, name, hasFailed, pid, }) {
     async function check() {
         let result;
         try {
-            result = (await execa__default["default"]("docker", ["inspect", name, "-f", "{{.Id}}"]))
+            result = (await execa("docker", ["inspect", name, "-f", "{{.Id}}"]))
                 .stdout;
         }
         catch {
             result = null;
         }
         // Debugging to help us solve CALS-366.
-        const ps = execa__default["default"]("docker", ["ps"]);
+        const ps = execa("docker", ["ps"]);
         pipeToConsole(ps, `${name} (ps)`);
         await ps;
         // Debugging to help us solve CALS-366.
@@ -1730,12 +1682,12 @@ async function getContainerId({ executor, name, hasFailed, pid, }) {
 }
 async function pullImage({ imageId }) {
     console.log(`Pulling ${imageId}`);
-    const process = execa__default["default"]("docker", ["pull", imageId]);
+    const process = execa("docker", ["pull", imageId]);
     pipeToConsole(process, `pull-image (${imageId})`);
     await process;
 }
 async function checkImageExistsLocally({ imageId, }) {
-    const result = await execa__default["default"]("docker", ["images", "-q", imageId]);
+    const result = await execa("docker", ["images", "-q", imageId]);
     const found = result.stdout != "";
     console.log(`image ${imageId} ${found ? "was present locally" : "was not found locally"}`);
     return found;
@@ -1771,8 +1723,8 @@ async function startContainer({ executor, network, imageId, alias, env, dockerAr
     }
     args.push(imageId);
     console.log(`Starting ${imageId}`);
-    const process = execa__default["default"]("docker", args);
-    pipeToConsole(process, alias !== null && alias !== void 0 ? alias : containerName);
+    const process = execa("docker", args);
+    pipeToConsole(process, alias ?? containerName);
     let failed = false;
     process.catch(() => {
         failed = true;
@@ -1788,8 +1740,8 @@ async function startContainer({ executor, network, imageId, alias, env, dockerAr
     });
     executor.registerCleanupTask(async () => {
         console.log(`Stopping container ${containerName}`);
-        const r = execa__default["default"]("docker", ["stop", containerName]);
-        pipeToConsole(r, (alias !== null && alias !== void 0 ? alias : containerName) + " (stop)");
+        const r = execa("docker", ["stop", containerName]);
+        pipeToConsole(r, (alias ?? containerName) + " (stop)");
         try {
             await r;
         }
@@ -1809,8 +1761,8 @@ async function startContainer({ executor, network, imageId, alias, env, dockerAr
     };
 }
 async function runNpmRunScript(name, options) {
-    const result = execa__default["default"]("npm", ["run", name], {
-        env: options === null || options === void 0 ? void 0 : options.env,
+    const result = execa("npm", ["run", name], {
+        env: options?.env,
     });
     pipeToConsole(result, `npm run ${name}`);
     await result;
@@ -1822,8 +1774,8 @@ async function getDockerHostAddress() {
     if (process.platform === "darwin" || process.platform === "win32") {
         return "host.docker.internal";
     }
-    if (fs__default["default"].existsSync("/.dockerenv")) {
-        const process = execa__default["default"]("ip", ["route"]);
+    if (fs.existsSync("/.dockerenv")) {
+        const process = execa("ip", ["route"]);
         pipeToConsole(process, "ip route");
         const res = await process;
         try {
@@ -1840,7 +1792,7 @@ async function getDockerHostAddress() {
 }
 async function waitForEnterToContinue(prompt = "Press enter to continue") {
     return new Promise((resolve, reject) => {
-        read__default["default"]({
+        read({
             prompt,
             silent: true,
         }, (err) => {
@@ -1855,27 +1807,5 @@ async function waitForEnterToContinue(prompt = "Press enter to continue") {
 
 const VERSION = version;
 
-exports.CacheProvider = CacheProvider;
-exports.Config = Config;
-exports.DefinitionFile = DefinitionFile;
-exports.GitHubService = GitHubService;
-exports.Reporter = Reporter;
-exports.TestExecutor = TestExecutor;
-exports.VERSION = VERSION;
-exports.createGitHubService = createGitHubService;
-exports.createNetwork = createNetwork;
-exports.createReporter = createReporter;
-exports.createTestExecutor = createTestExecutor;
-exports.curl = curl;
-exports.definition = index$3;
-exports.getDockerHostAddress = getDockerHostAddress;
-exports.github = index$2;
-exports.pollForCondition = pollForCondition;
-exports.runNpmRunScript = runNpmRunScript;
-exports.snyk = index$1;
-exports.sonarCloud = index;
-exports.startContainer = startContainer;
-exports.waitForEnterToContinue = waitForEnterToContinue;
-exports.waitForHttpOk = waitForHttpOk;
-exports.waitForPostgresAvailable = waitForPostgresAvailable;
+export { CacheProvider, Config, DefinitionFile, GitHubService, Reporter, TestExecutor, VERSION, createGitHubService, createNetwork, createReporter, createTestExecutor, curl, index$3 as definition, getDockerHostAddress, index$2 as github, pollForCondition, runNpmRunScript, index$1 as snyk, index as sonarCloud, startContainer, waitForEnterToContinue, waitForHttpOk, waitForPostgresAvailable };
 //# sourceMappingURL=index.js.map