@capraconsulting/cals-cli 3.6.0 → 3.7.0

package/lib/{cals-cli.js → cals-cli.mjs}

@@ -1,74 +1,32 @@
 #!/usr/bin/env node
-'use strict';
+import semver from 'semver';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import fs from 'fs';
+import yaml from 'js-yaml';
+import { uniq, keyBy, sortBy, groupBy, sumBy, repeat } from 'lodash-es';
+import pMap from 'p-map';
+import AJV from 'ajv';
+import { Octokit } from '@octokit/rest';
+import fetch from 'node-fetch';
+import pLimit from 'p-limit';
+import keytar from 'keytar';
+import * as process$2 from 'process';
+import { performance } from 'perf_hooks';
+import { deprecate } from 'util';
+import path from 'path';
+import rimraf from 'rimraf';
+import cachedir from 'cachedir';
+import https from 'https';
+import os from 'os';
+import chalk from 'chalk';
+import readline from 'readline';
+import { sprintf } from 'sprintf-js';
+import read from 'read';
+import findUp from 'find-up';
+import execa from 'execa';
 
-var semver = require('semver');
-var yargs = require('yargs');
-var fs = require('fs');
-var yaml = require('js-yaml');
-var lodash = require('lodash');
-var pMap = require('p-map');
-var AJV = require('ajv');
-var rest = require('@octokit/rest');
-var fetch = require('node-fetch');
-var pLimit = require('p-limit');
-var keytar = require('keytar');
-var process$2 = require('process');
-var perf_hooks = require('perf_hooks');
-var util = require('util');
-var path = require('path');
-var rimraf = require('rimraf');
-var cachedir = require('cachedir');
-var https = require('https');
-var os = require('os');
-var chalk = require('chalk');
-var readline = require('readline');
-var sprintfJs = require('sprintf-js');
-var read = require('read');
-var findUp = require('find-up');
-var execa = require('execa');
-
-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 semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
-var yargs__default = /*#__PURE__*/_interopDefaultLegacy(yargs);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
-var pMap__default = /*#__PURE__*/_interopDefaultLegacy(pMap);
-var AJV__default = /*#__PURE__*/_interopDefaultLegacy(AJV);
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
-var pLimit__default = /*#__PURE__*/_interopDefaultLegacy(pLimit);
-var keytar__default = /*#__PURE__*/_interopDefaultLegacy(keytar);
-var process__namespace = /*#__PURE__*/_interopNamespace(process$2);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var rimraf__default = /*#__PURE__*/_interopDefaultLegacy(rimraf);
-var cachedir__default = /*#__PURE__*/_interopDefaultLegacy(cachedir);
-var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
-var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
-var chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
-var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
-var read__default = /*#__PURE__*/_interopDefaultLegacy(read);
-var findUp__default = /*#__PURE__*/_interopDefaultLegacy(findUp);
-var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
-
-var version = "3.6.0";
+var version = "3.7.0";
 var engines = {
 	node: ">=12.0.0"
 };
@@ -374,12 +332,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.
@@ -424,7 +381,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);
@@ -448,11 +406,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
@@ -464,7 +423,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);
     }
@@ -482,19 +441,17 @@ 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)));
 }
 
 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;
@@ -502,10 +459,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);
     }
 }
 
@@ -570,15 +527,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++;
@@ -644,6 +605,7 @@ class GitHubService {
             /* eslint-enable @typescript-eslint/no-unsafe-member-access */
         });
     }
+    _requestCount = 0;
     get requestCount() {
         return this._requestCount;
     }
@@ -658,18 +620,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$2.stderr.write("Unauthorized\n");
             await this.tokenProvider.markInvalid();
         }
         // If you get 502 after 10s, it is a timeout.
@@ -762,15 +724,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) {
@@ -839,15 +798,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) {
@@ -972,17 +928,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;
         });
@@ -1024,27 +979,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;
         });
@@ -1055,7 +1006,7 @@ class GitHubService {
     }
 }
 async function createOctokit(config, tokenProvider) {
-    return new rest.Octokit({
+    return new Octokit({
         auth: await tokenProvider.getToken(),
         request: {
             agent: config.agent,
@@ -1063,8 +1014,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),
@@ -1074,15 +1024,13 @@ async function createGitHubService(props) {
 }
 
 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;
@@ -1090,21 +1038,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 [];
         }
@@ -1132,7 +1081,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",
@@ -1169,7 +1118,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}`,
                     };
                 }),
             ];
@@ -1181,10 +1130,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(),
     });
 }
 
@@ -1222,23 +1170,24 @@ function getGitHubRepoId(repo) {
 
 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)),
         };
     }
@@ -1246,11 +1195,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
@@ -1268,20 +1217,18 @@ class CacheProvider {
      * Delete all cached data.
      */
     cleanup() {
-        rimraf__default["default"].sync(this.config.cacheDir);
+        rimraf.sync(this.config.cacheDir);
     }
 }
 
 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) {
@@ -1292,12 +1239,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);
@@ -1319,27 +1266,29 @@ 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;
     }
 }
 
 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`);
@@ -1376,7 +1325,7 @@ function createCacheProvider(config, argv) {
     }
     // old option: --no-cache
     if (argv.cache === false) {
-        util.deprecate(() => {
+        deprecate(() => {
             cache.mustValidate = true;
         }, "The --no-cache option is deprecated. See new --validate-cache option")();
     }
@@ -1396,7 +1345,7 @@ function getDefinitionFile(argv) {
         throw Error("Missing --definition-file option");
     }
     const definitionFile = argv.definitionFile;
-    if (!fs__default["default"].existsSync(definitionFile)) {
+    if (!fs.existsSync(definitionFile)) {
         throw Error(`The file ${definitionFile} does not exist`);
     }
     return new DefinitionFile(definitionFile);
@@ -1453,9 +1402,9 @@ function reorderListToSimilarAsBefore(oldList, updatedList, selector, insertLast
 }
 
 async function getReposFromGitHub(github, orgs) {
-    return (await pMap__default["default"](orgs, async (org) => {
+    return (await pMap(orgs, async (org) => {
         const repos = await github.getOrgRepoList({ org: org.login });
-        return pMap__default["default"](repos, async (repo) => {
+        return pMap(repos, async (repo) => {
             const detailedRepo = await github.getRepository(repo.owner.login, repo.name);
             if (detailedRepo === undefined) {
                 throw Error(`Repo not found: ${repo.owner.login}/${repo.name}`);
@@ -1469,11 +1418,11 @@ async function getReposFromGitHub(github, orgs) {
     })).flat();
 }
 async function getTeams(github, orgs) {
-    const intermediate = await pMap__default["default"](orgs, async (org) => {
+    const intermediate = await pMap(orgs, async (org) => {
         const teams = await github.getTeamList(org);
         return {
             org,
-            teams: await pMap__default["default"](teams, async (team) => ({
+            teams: await pMap(teams, async (team) => ({
                 team,
                 users: await github.getTeamMemberListIncludingInvited(org, team),
             })),
@@ -1502,11 +1451,11 @@ function getFormattedTeams(oldTeams, teams) {
             permission: it.permission,
         }));
     return result
-        ? reorderListToSimilarAsBefore(oldTeams !== null && oldTeams !== void 0 ? oldTeams : [], result, (it) => it.name)
+        ? reorderListToSimilarAsBefore(oldTeams ?? [], result, (it) => it.name)
         : undefined;
 }
 async function getOrgs(github, orgs) {
-    return pMap__default["default"](orgs, (it) => github.getOrg(it));
+    return pMap(orgs, (it) => github.getOrg(it));
 }
 function removeDuplicates(items, selector) {
     const ids = [];
@@ -1521,7 +1470,7 @@ function removeDuplicates(items, selector) {
     return result;
 }
 async function getMembers(github, orgs) {
-    return removeDuplicates((await pMap__default["default"](orgs, (org) => github.getOrgMembersListIncludingInvited(org.login)))
+    return removeDuplicates((await pMap(orgs, (org) => github.getOrgMembersListIncludingInvited(org.login)))
         .flat()
         .map((it) => it.login), (it) => it);
 }
@@ -1535,15 +1484,14 @@ async function getProjects(github, orgs, definition, snyk) {
     const snykReposPromise = getSnykRepos(snyk, definition);
     const repos = await getReposFromGitHub(github, orgs);
     const snykRepos = await snykReposPromise;
-    const definitionRepos = lodash.keyBy(getRepos(definition), (it) => it.id);
+    const definitionRepos = keyBy(getRepos(definition), (it) => it.id);
     const projectGroups = Object.values(repos.reduce((acc, cur) => {
-        var _a, _b, _c, _d;
         const org = cur.repository.owner.login;
         const repoId = getRepoId(org, cur.repository.name);
-        const projectName = (_c = (_b = (_a = definitionRepos[repoId]) === null || _a === void 0 ? void 0 : _a.project) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "Unknown";
+        const projectName = definitionRepos[repoId]?.project?.name ?? "Unknown";
         const project = acc[projectName] || {
             name: projectName,
-            definition: (_d = definitionRepos[repoId]) === null || _d === void 0 ? void 0 : _d.project,
+            definition: definitionRepos[repoId]?.project,
             repos: [],
         };
         return {
@@ -1558,39 +1506,36 @@ async function getProjects(github, orgs, definition, snyk) {
         };
     }, {}));
     const projects = projectGroups.map((project) => {
-        var _a, _b;
         const github = Object.entries(project.repos).map(([org, list]) => {
-            var _a, _b, _c, _d;
             const commonTeams = getCommonTeams(list);
-            const oldOrg = (_b = (_a = project.definition) === null || _a === void 0 ? void 0 : _a.github) === null || _b === void 0 ? void 0 : _b.find((it) => it.organization == org);
+            const oldOrg = project.definition?.github?.find((it) => it.organization == org);
             const repos = list.map((repo) => {
-                var _a, _b;
                 const repoId = getRepoId(repo.basic.owner.login, repo.basic.name);
                 const definitionRepo = definitionRepos[repoId];
                 const result = {
                     name: repo.basic.name,
-                    previousNames: definitionRepo === null || definitionRepo === void 0 ? void 0 : definitionRepo.repo.previousNames,
+                    previousNames: definitionRepo?.repo.previousNames,
                     archived: repo.repository.archived ? true : undefined,
                     issues: repo.repository.has_issues ? undefined : false,
                     wiki: repo.repository.has_wiki ? undefined : false,
-                    teams: getFormattedTeams((_b = (_a = definitionRepo === null || definitionRepo === void 0 ? void 0 : definitionRepo.repo) === null || _a === void 0 ? void 0 : _a.teams) !== null && _b !== void 0 ? _b : [], getSpecificTeams(repo.teams, commonTeams)),
+                    teams: getFormattedTeams(definitionRepo?.repo?.teams ?? [], getSpecificTeams(repo.teams, commonTeams)),
                     snyk: snykRepos.includes(repoId) ? true : undefined,
                     public: repo.repository.private ? undefined : true,
-                    responsible: definitionRepo === null || definitionRepo === void 0 ? void 0 : definitionRepo.repo.responsible,
+                    responsible: definitionRepo?.repo.responsible,
                 };
                 // Try to preserve property order.
                 return Object.fromEntries(reorderListToSimilarAsBefore(definitionRepo ? Object.entries(definitionRepo.repo) : [], Object.entries(result), (it) => it[0], true));
             });
-            const teams = getFormattedTeams((_c = oldOrg === null || oldOrg === void 0 ? void 0 : oldOrg.teams) !== null && _c !== void 0 ? _c : [], commonTeams);
+            const teams = getFormattedTeams(oldOrg?.teams ?? [], commonTeams);
             return {
                 organization: org,
                 teams: teams,
-                repos: reorderListToSimilarAsBefore((_d = oldOrg === null || oldOrg === void 0 ? void 0 : oldOrg.repos) !== null && _d !== void 0 ? _d : [], repos, (it) => it.name),
+                repos: reorderListToSimilarAsBefore(oldOrg?.repos ?? [], repos, (it) => it.name),
             };
         });
         return {
             name: project.name,
-            github: reorderListToSimilarAsBefore((_b = (_a = project.definition) === null || _a === void 0 ? void 0 : _a.github) !== null && _b !== void 0 ? _b : [], github, (it) => it.organization),
+            github: reorderListToSimilarAsBefore(project.definition?.github ?? [], github, (it) => it.organization),
         };
     });
     return reorderListToSimilarAsBefore(definition.projects, projects, (it) => it.name);
@@ -1635,7 +1580,7 @@ async function dumpSetup(config, reporter, github, snyk, outfile, definitionFile
     //  package. However it often produced invalid yaml, so we have removed
     //  it. We might want to revisit it to preserve comments.
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-explicit-any
-    const doc = yaml__default["default"].load(await definitionFile.getContents());
+    const doc = yaml.load(await definitionFile.getContents());
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     doc.snyk = generatedDefinition.snyk;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -1643,7 +1588,7 @@ async function dumpSetup(config, reporter, github, snyk, outfile, definitionFile
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     doc.github = generatedDefinition.github;
     // Convert to/from plain JSON so that undefined elements are removed.
-    fs__default["default"].writeFileSync(outfile, yaml__default["default"].dump(JSON.parse(JSON.stringify(doc))));
+    fs.writeFileSync(outfile, yaml.dump(JSON.parse(JSON.stringify(doc))));
     reporter.info(`Saved to ${outfile}`);
     reporter.info(`Number of GitHub requests: ${github.requestCount}`);
 }
@@ -1688,7 +1633,7 @@ const command$f = {
         .demandCommand()
         .usage(`cals definition`),
     handler: () => {
-        yargs__default["default"].showHelp();
+        yargs(hideBin(process.argv)).showHelp();
     },
 };
 
@@ -1716,9 +1661,9 @@ const command$d = {
 async function analyzeDirectory(reporter, config, github, org) {
     const repos = await github.getOrgRepoList({ org });
     const reposDict = repos.reduce((acc, cur) => ({ ...acc, [cur.name]: cur }), {});
-    const dirs = fs__default["default"]
+    const dirs = fs
         .readdirSync(config.cwd)
-        .filter((it) => fs__default["default"].statSync(path__default["default"].join(config.cwd, it)).isDirectory())
+        .filter((it) => fs.statSync(path.join(config.cwd, it)).isDirectory())
         // Skip hidden folders
         .filter((it) => !it.startsWith("."))
         .sort((a, b) => a.localeCompare(b));
@@ -1729,18 +1674,18 @@ async function analyzeDirectory(reporter, config, github, org) {
     };
     dirs.forEach((it) => {
         if (!(it in reposDict)) {
-            reporter.warn(sprintfJs.sprintf("%-30s  <-- Not found in repository list (maybe changed name?)", it));
+            reporter.warn(sprintf("%-30s  <-- Not found in repository list (maybe changed name?)", it));
             stats.unknown++;
             return;
         }
         if (reposDict[it].isArchived) {
-            reporter.info(sprintfJs.sprintf("%-30s  <-- Archived", it));
+            reporter.info(sprintf("%-30s  <-- Archived", it));
             stats.archived++;
             return;
         }
         stats.ok += 1;
     });
-    reporter.info(sprintfJs.sprintf("Stats: unknown=%d  archived=%d  ok=%d", stats.unknown, stats.archived, stats.ok));
+    reporter.info(sprintf("Stats: unknown=%d  archived=%d  ok=%d", stats.unknown, stats.archived, stats.ok));
     reporter.info("Use `cals github generate-clone-commands` to check for repositories not checked out");
 }
 const command$c = {
@@ -1763,7 +1708,6 @@ const command$c = {
 };
 
 function getChangedRepoAttribs(definitionRepo, actualRepo) {
-    var _a, _b;
     const attribs = [];
     const archived = definitionRepo.archived || false;
     if (archived !== actualRepo.archived) {
@@ -1771,13 +1715,13 @@ function getChangedRepoAttribs(definitionRepo, actualRepo) {
             archived,
         });
     }
-    const issues = (_a = definitionRepo.issues) !== null && _a !== void 0 ? _a : true;
+    const issues = definitionRepo.issues ?? true;
     if (issues !== actualRepo.has_issues && !actualRepo.archived) {
         attribs.push({
             issues,
         });
     }
-    const wiki = (_b = definitionRepo.wiki) !== null && _b !== void 0 ? _b : true;
+    const wiki = definitionRepo.wiki ?? true;
     if (wiki !== actualRepo.has_wiki && !actualRepo.archived) {
         attribs.push({
             wiki,
@@ -1794,7 +1738,7 @@ function getChangedRepoAttribs(definitionRepo, actualRepo) {
 async function getUnknownRepos(github, definition, limitToOrg) {
     const knownRepos = getRepos(definition).map((it) => it.id);
     const orgs = getGitHubOrgs(definition).filter((orgName) => limitToOrg === undefined || limitToOrg === orgName);
-    return lodash.sortBy((await pMap__default["default"](orgs, (orgName) => github.getOrgRepoList({ org: orgName })))
+    return sortBy((await pMap(orgs, (orgName) => github.getOrgRepoList({ org: orgName })))
         .flat()
         .filter((it) => !knownRepos.includes(`${it.owner.login}/${it.name}`)), (it) => `${it.owner.login}/${it.name}`);
 }
@@ -1809,9 +1753,8 @@ function getExpectedTeams(projectTeams, repoTeams) {
     ];
 }
 async function getRepoTeamChanges({ github, org, projectRepo, repo, }) {
-    var _a, _b;
     const changes = [];
-    const expectedTeams = getExpectedTeams((_a = org.teams) !== null && _a !== void 0 ? _a : [], (_b = projectRepo.teams) !== null && _b !== void 0 ? _b : []);
+    const expectedTeams = getExpectedTeams(org.teams ?? [], projectRepo.teams ?? []);
     const existingTeams = await github.getRepositoryTeamsList(repo);
     // Check for teams to be added / modified.
     for (const repoteam of expectedTeams) {
@@ -1889,7 +1832,7 @@ async function createChangeSetItemsForProjects(github, definition, limitToOrg) {
     const orgs = definition.projects
         .flatMap((it) => it.github)
         .filter((org) => limitToOrg === undefined || limitToOrg === org.organization);
-    changes.push(...(await pMap__default["default"](orgs, async (org) => pMap__default["default"](org.repos || [], (projectRepo) => getProjectRepoChanges({
+    changes.push(...(await pMap(orgs, async (org) => pMap(org.repos || [], (projectRepo) => getProjectRepoChanges({
         github,
         org,
         projectRepo,
@@ -1987,7 +1930,7 @@ async function createChangeSetItemsForTeams(github, definition, org) {
         }
     });
     const overlappingTeams = actualTeams.filter((it) => wantedTeamNames.includes(it.name));
-    await pMap__default["default"](overlappingTeams, async (actualTeam) => {
+    await pMap(overlappingTeams, async (actualTeam) => {
         const wantedTeam = teams.find((it) => it.name === actualTeam.name);
         const actualMembers = await github.getTeamMemberListIncludingInvited(org, actualTeam);
         actualMembers
@@ -2190,7 +2133,7 @@ function createOrgGetter(github) {
     const semaphores = {};
     function getSemaphore(orgName) {
         if (!(orgName in semaphores)) {
-            semaphores[orgName] = pLimit__default["default"](1);
+            semaphores[orgName] = pLimit(1);
         }
         return semaphores[orgName];
     }
@@ -2247,7 +2190,7 @@ async function process$1(reporter, github, definition, getOrg, execute, limitToO
     }
     if (execute && changes.length > 0) {
         const cont = await new Promise((resolve, reject) => {
-            read__default["default"]({
+            read({
                 prompt: "Confirm you want to execute the changes [y/N]: ",
                 timeout: 60000,
             }, (err, answer) => {
@@ -2298,7 +2241,7 @@ const command$b = {
 
 async function generateCloneCommands({ reporter, config, github, org, ...opt }) {
     if (!opt.listGroups && !opt.all && opt.group === undefined) {
-        yargs__default["default"].showHelp();
+        yargs(hideBin(process.argv)).showHelp();
         return;
     }
     const repos = await github.getOrgRepoList({ org });
@@ -2318,11 +2261,11 @@ async function generateCloneCommands({ reporter, config, github, org, ...opt })
             .filter((it) => opt.name === undefined || it.name.includes(opt.name))
             .filter((it) => opt.topic === undefined || includesTopic(it, opt.topic))
             .filter((it) => !opt.excludeExisting ||
-            !fs__default["default"].existsSync(path__default["default"].resolve(config.cwd, it.name)))
+            !fs.existsSync(path.resolve(config.cwd, it.name)))
             .forEach((repo) => {
             // The output of this is used to pipe into e.g. bash.
             // We cannot use reporter.log as it adds additional characters.
-            process.stdout.write(sprintfJs.sprintf('[ ! -e "%s" ] && git clone %s\n', repo.name, repo.sshUrl));
+            process.stdout.write(sprintf('[ ! -e "%s" ] && git clone %s\n', repo.name, repo.sshUrl));
         });
     });
 }
@@ -2420,10 +2363,10 @@ async function listPullRequestsStats({ reporter, github, }) {
         reporter.log("Pull requests stats:");
         reporter.log("A pull request is considered old after 60 days");
         reporter.log("");
-        reporter.log(sprintfJs.sprintf("%-40s %12s %2s %12s %2s", "", "normal", "", "snyk", ""));
-        reporter.log(sprintfJs.sprintf("%-40s %7s %7s %7s %7s", "Repo", "old", "recent", "old", "recent"));
+        reporter.log(sprintf("%-40s %12s %2s %12s %2s", "", "normal", "", "snyk", ""));
+        reporter.log(sprintf("%-40s %7s %7s %7s %7s", "Repo", "old", "recent", "old", "recent"));
         categories.forEach((cat) => {
-            reporter.log(sprintfJs.sprintf("%-40s %7s %7s %7s %7s", cat.key, cat.old.length === 0 ? "" : cat.old.length, cat.recent.length === 0 ? "" : cat.recent.length, cat.oldSnyk.length === 0 ? "" : cat.oldSnyk.length, cat.recentSnyk.length === 0 ? "" : cat.recentSnyk.length));
+            reporter.log(sprintf("%-40s %7s %7s %7s %7s", cat.key, cat.old.length === 0 ? "" : cat.old.length, cat.recent.length === 0 ? "" : cat.recent.length, cat.oldSnyk.length === 0 ? "" : cat.oldSnyk.length, cat.recentSnyk.length === 0 ? "" : cat.recentSnyk.length));
         });
     }
 }
@@ -2588,15 +2531,15 @@ async function listWebhooks(reporter, cache, github, org) {
             }
             switch (hook.name) {
                 case "web":
-                    reporter.log(sprintfJs.sprintf("    web: %s (%s) (%s)", hook.config.url, hook.last_response.code, hook.events.join(", ")));
+                    reporter.log(sprintf("    web: %s (%s) (%s)", hook.config.url, hook.last_response.code, hook.events.join(", ")));
                     break;
                 case "jenkinsgit":
-                    reporter.log(sprintfJs.sprintf("    jenkinsgit: %s (%s) (%s)", 
+                    reporter.log(sprintf("    jenkinsgit: %s (%s) (%s)", 
                     // This is undocumented.
                     hook.config.jenkins_url, hook.last_response.code, hook.events.join(", ")));
                     break;
                 case "docker":
-                    reporter.log(sprintfJs.sprintf("    docker (%s) (%s)", hook.last_response.code, hook.events.join(", ")));
+                    reporter.log(sprintf("    docker (%s) (%s)", hook.last_response.code, hook.events.join(", ")));
                     break;
                 default:
                     reporter.log(`  ${hook.name}: <unknown type>`);
@@ -2625,7 +2568,7 @@ async function setToken$1({ reporter, token, tokenProvider, }) {
         reporter.info("Need API token to talk to GitHub");
         reporter.info("https://github.com/settings/tokens/new?scopes=repo:status,read:repo_hook");
         token = await new Promise((resolve, reject) => {
-            read__default["default"]({
+            read({
                 prompt: "Enter new GitHub API token: ",
                 silent: true,
             }, (err, answer) => {
@@ -2689,20 +2632,22 @@ var CloneType;
     CloneType[CloneType["SSH"] = 1] = "SSH";
 })(CloneType || (CloneType = {}));
 class GitRepo {
+    path;
+    logCommand;
     constructor(path, logCommand) {
         this.path = path;
         this.logCommand = logCommand;
     }
     async cloneGitHubRepo(org, name, cloneType) {
-        const parent = path__default["default"].dirname(this.path);
-        if (!fs__default["default"].existsSync(parent)) {
-            await fs__default["default"].promises.mkdir(parent, { recursive: true });
+        const parent = path.dirname(this.path);
+        if (!fs.existsSync(parent)) {
+            await fs.promises.mkdir(parent, { recursive: true });
         }
         const cloneUrl = cloneType === CloneType.SSH
             ? `git@github.com:${org}/${name}.git`
             : `https://github.com/${org}/${name}.git`;
         try {
-            const result = await execa__default["default"]("git", ["clone", cloneUrl, this.path], {
+            const result = await execa("git", ["clone", cloneUrl, this.path], {
                 cwd: parent,
             });
             await this.logCommand(result);
@@ -2715,7 +2660,7 @@ class GitRepo {
     }
     async git(args) {
         try {
-            const result = await execa__default["default"]("git", args, {
+            const result = await execa("git", args, {
                 cwd: this.path,
             });
             await this.logCommand(result);
@@ -2748,7 +2693,6 @@ class GitRepo {
         return parseShortlogSummary(result.stdout);
     }
     async update() {
-        var _a;
         const fetchOnly = async () => {
             await this.git(["fetch"]);
             return {
@@ -2771,7 +2715,7 @@ class GitRepo {
         return {
             dirty: false,
             updated: wasUpdated(result.stdout),
-            updatedRange: (_a = getUpdateRange(result.stdout)) !== null && _a !== void 0 ? _a : undefined,
+            updatedRange: getUpdateRange(result.stdout) ?? undefined,
         };
     }
 }
@@ -2783,11 +2727,11 @@ const CALS_LOG = ".cals.log";
  * backward slashes in paths.
  */
 function getRelpath(it) {
-    return path__default["default"].join(it.group, it.name);
+    return path.join(it.group, it.name);
 }
 async function appendFile(path, data) {
     return new Promise((resolve, reject) => {
-        fs__default["default"].appendFile(path, data, { encoding: "utf-8" }, (err) => {
+        fs.appendFile(path, data, { encoding: "utf-8" }, (err) => {
             if (err !== null) {
                 reject(err);
             }
@@ -2796,15 +2740,14 @@ async function appendFile(path, data) {
     });
 }
 function getAliases(repo) {
-    var _a;
-    return ((_a = repo.previousNames) !== null && _a !== void 0 ? _a : []).map((it) => ({
+    return (repo.previousNames ?? []).map((it) => ({
         group: it.project,
         name: it.name,
     }));
 }
 async function updateReposInParallel(reporter, items) {
     // Perform git operations in parallel, but limit how much.
-    const semaphore = pLimit__default["default"](30);
+    const semaphore = pLimit(30);
     const promises = items.map((repo) => semaphore(async () => {
         try {
             return {
@@ -2848,7 +2791,7 @@ async function updateRepos(reporter, foundRepos) {
             : undefined;
         // We only focus on changes made by humans, which we make
         // green while keeping the other changes gray.
-        const repoNameFormat = (authors === null || authors === void 0 ? void 0 : authors.every(({ name }) => isBotAuthor(name)))
+        const repoNameFormat = authors?.every(({ name }) => isBotAuthor(name))
             ? reporter.format.gray
             : reporter.format.greenBright;
         reporter.info(`Updated: ${repoNameFormat(repo.id)}`);
@@ -2865,8 +2808,8 @@ async function updateRepos(reporter, foundRepos) {
     }
 }
 function guessDefinitionRepoName(rootdir, cals) {
-    const p = path__default["default"].resolve(rootdir, cals.resourcesDefinition.path);
-    const relativePath = path__default["default"].relative(rootdir, p);
+    const p = path.resolve(rootdir, cals.resourcesDefinition.path);
+    const relativePath = path.relative(rootdir, p);
     if (relativePath.slice(0, 1) == ".") {
         return null;
     }
@@ -2879,8 +2822,8 @@ function guessDefinitionRepoName(rootdir, cals) {
     return parts[1];
 }
 async function getDefinition(rootdir, cals) {
-    const p = path__default["default"].resolve(rootdir, cals.resourcesDefinition.path);
-    if (!fs__default["default"].existsSync(p)) {
+    const p = path.resolve(rootdir, cals.resourcesDefinition.path);
+    if (!fs.existsSync(p)) {
         throw Error(`The file ${p} does not exist`);
     }
     return new DefinitionFile(p).getDefinition();
@@ -2889,9 +2832,9 @@ async function getDefinition(rootdir, cals) {
  * Get directory names within a directory.
  */
 function getDirNames(parent) {
-    return (fs__default["default"]
+    return (fs
         .readdirSync(parent)
-        .filter((it) => fs__default["default"].statSync(path__default["default"].join(parent, it)).isDirectory())
+        .filter((it) => fs.statSync(path.join(parent, it)).isDirectory())
         // Skip hidden folders
         .filter((it) => !it.startsWith("."))
         .sort((a, b) => a.localeCompare(b)));
@@ -2901,9 +2844,9 @@ async function getReposInOrg(cals, rootdir) {
     return getRepos(definition)
         .filter((it) => it.orgName === cals.githubOrganization)
         .filter((it) => cals.resourcesDefinition.tags === undefined ||
-        (it.project.tags || []).some((tag) => { var _a; return (_a = cals.resourcesDefinition.tags) === null || _a === void 0 ? void 0 : _a.includes(tag); }) ||
+        (it.project.tags || []).some((tag) => cals.resourcesDefinition.tags?.includes(tag)) ||
         // Always include if already checked out to avoid stale state.
-        fs__default["default"].existsSync(path__default["default"].join(rootdir, it.project.name, it.repo.name)));
+        fs.existsSync(path.join(rootdir, it.project.name, it.repo.name)));
 }
 function getExpectedRepo(item) {
     return {
@@ -2916,8 +2859,8 @@ function getExpectedRepo(item) {
     };
 }
 function getGitRepo(rootdir, relpath) {
-    return new GitRepo(path__default["default"].resolve(rootdir, relpath), async (result) => {
-        await appendFile(path__default["default"].resolve(rootdir, CALS_LOG), JSON.stringify({
+    return new GitRepo(path.resolve(rootdir, relpath), async (result) => {
+        await appendFile(path.resolve(rootdir, CALS_LOG), JSON.stringify({
             time: new Date().toISOString(),
             context: relpath,
             type: "exec-result",
@@ -2971,7 +2914,7 @@ async function getExpectedRepos(reporter, github, cals, rootdir) {
 }
 async function getInput(prompt) {
     return new Promise((resolve, reject) => {
-        read__default["default"]({
+        read({
             prompt,
             timeout: 60000,
         }, (err, answer) => {
@@ -3009,15 +2952,15 @@ async function sync$1({ reporter, github, cals, rootdir, askClone, askMove, }) {
     const foundRepos = [];
     // Categorize all dirs.
     for (const topdir of getDirNames(rootdir)) {
-        const isGitDir = fs__default["default"].existsSync(path__default["default"].join(rootdir, topdir, ".git"));
+        const isGitDir = fs.existsSync(path.join(rootdir, topdir, ".git"));
         if (isGitDir) {
             // Do not traverse deeper inside another Git repo, as that might
             // mean we do not have the proper grouped structure.
             unknownDirs.push(topdir);
             continue;
         }
-        for (const subdir of getDirNames(path__default["default"].join(rootdir, topdir))) {
-            const p = path__default["default"].join(topdir, subdir);
+        for (const subdir of getDirNames(path.join(rootdir, topdir))) {
+            const p = path.join(topdir, subdir);
             const expectedRepo = expectedRepos.find((it) => getRelpath(it) === p ||
                 it.aliases.some((alias) => getRelpath(alias) === p));
             if (expectedRepo === undefined) {
@@ -3045,9 +2988,9 @@ async function sync$1({ reporter, github, cals, rootdir, askClone, askMove, }) {
         for (const it of archivedRepos) {
             reporter.info(`  ${it.actualRelpath}`);
         }
-        const thisDirName = path__default["default"].basename(process.cwd());
+        const thisDirName = path.basename(process.cwd());
         const archiveDir = `../${thisDirName}-archive`;
-        const hasArchiveDir = fs__default["default"].existsSync(archiveDir);
+        const hasArchiveDir = fs.existsSync(archiveDir);
         if (hasArchiveDir) {
             reporter.info("To move these:");
             for (const it of archivedRepos) {
@@ -3070,17 +3013,17 @@ async function sync$1({ reporter, github, cals, rootdir, askClone, askMove, }) {
             const shouldMove = await askMoveConfirm();
             if (shouldMove) {
                 for (const it of movedRepos) {
-                    const src = path__default["default"].join(rootdir, it.actualRelpath);
-                    const dest = path__default["default"].join(rootdir, getRelpath(it));
-                    const destParent = path__default["default"].join(rootdir, it.group);
-                    if (fs__default["default"].existsSync(dest)) {
+                    const src = path.join(rootdir, it.actualRelpath);
+                    const dest = path.join(rootdir, getRelpath(it));
+                    const destParent = path.join(rootdir, it.group);
+                    if (fs.existsSync(dest)) {
                         throw new Error(`Target directory already exists: ${dest} - cannot move ${it.actualRelpath}`);
                     }
                     reporter.info(`Moving ${it.actualRelpath} -> ${getRelpath(it)}`);
-                    if (!fs__default["default"].existsSync(destParent)) {
-                        await fs__default["default"].promises.mkdir(destParent, { recursive: true });
+                    if (!fs.existsSync(destParent)) {
+                        await fs.promises.mkdir(destParent, { recursive: true });
                     }
-                    await fs__default["default"].promises.rename(src, dest);
+                    await fs.promises.rename(src, dest);
                 }
                 // We would have to update expectedRepos if we want to continue.
                 // Let's try keeping this simple.
@@ -3113,7 +3056,7 @@ async function sync$1({ reporter, github, cals, rootdir, askClone, askMove, }) {
     }
     const reposToUpdate = foundRepos.filter((it) => 
     // Avoid double-processing the defintion repo.
-    (definitionRepo === null || definitionRepo === void 0 ? void 0 : definitionRepo.id) !== it.id);
+    definitionRepo?.id !== it.id);
     reporter.info(`${reposToUpdate.length} repos identified to be updated`);
     await updateRepos(reporter, reposToUpdate);
     // Report repos with changes ahead.
@@ -3124,7 +3067,7 @@ async function sync$1({ reporter, github, cals, rootdir, askClone, askMove, }) {
     }
 }
 async function loadCalsManifest(config, reporter) {
-    const p = await findUp__default["default"](CALS_YAML, { cwd: config.cwd });
+    const p = await findUp(CALS_YAML, { cwd: config.cwd });
     if (p === undefined) {
         reporter.error(`File ${CALS_YAML} not found. See help`);
         process.exitCode = 1;
@@ -3133,12 +3076,12 @@ async function loadCalsManifest(config, reporter) {
     // TODO: Verify file has expected contents.
     //  (Can we easily generate schema for type and verify?)
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-explicit-any
-    const cals = yaml__default["default"].load(fs__default["default"].readFileSync(p, "utf-8"));
+    const cals = yaml.load(fs.readFileSync(p, "utf-8"));
     if (cals.version !== 2) {
         throw new Error(`Unexpected version in ${p}`);
     }
     return {
-        dir: path__default["default"].dirname(p),
+        dir: path.dirname(p),
         cals,
     };
 }
@@ -3243,23 +3186,21 @@ Notes:
   option to avoid stale cache. The cache can also be cleared with
   the "cals delete-cache" command.`),
     handler: () => {
-        yargs__default["default"].showHelp();
+        yargs(hideBin(process.argv)).showHelp();
     },
 };
 
 function totalSeverityCount(project) {
-    var _a;
-    return (((_a = project.issueCountsBySeverity.critical) !== null && _a !== void 0 ? _a : 0) +
+    return ((project.issueCountsBySeverity.critical ?? 0) +
         project.issueCountsBySeverity.high +
         project.issueCountsBySeverity.medium +
         project.issueCountsBySeverity.low);
 }
 function buildStatsLine(stats) {
-    var _a;
     function item(num, str) {
-        return num === 0 ? lodash.repeat(" ", str.length + 4) : sprintfJs.sprintf("%3d %s", num, str);
+        return num === 0 ? repeat(" ", str.length + 4) : sprintf("%3d %s", num, str);
     }
-    return sprintfJs.sprintf("%s  %s  %s  %s", item((_a = stats.critical) !== null && _a !== void 0 ? _a : 0, "critical"), item(stats.high, "high"), item(stats.medium, "medium"), item(stats.low, "low"));
+    return sprintf("%s  %s  %s  %s", item(stats.critical ?? 0, "critical"), item(stats.high, "high"), item(stats.medium, "medium"), item(stats.low, "low"));
 }
 async function report({ reporter, snyk, definitionFile, }) {
     const definition = await definitionFile.getDefinition();
@@ -3277,30 +3218,30 @@ async function report({ reporter, snyk, definitionFile, }) {
     function getProjectName(project) {
         return project ? project.name : "unknown project";
     }
-    const byProjects = lodash.sortBy(Object.values(lodash.groupBy(enhancedRepos, (it) => it.project ? it.project.name : "unknown")), (it) => getProjectName(it[0].project));
+    const byProjects = sortBy(Object.values(groupBy(enhancedRepos, (it) => it.project ? it.project.name : "unknown")), (it) => getProjectName(it[0].project));
     if (byProjects.length === 0) {
         reporter.info("No issues found");
     }
     else {
-        reporter.info(sprintfJs.sprintf("%-70s %s", "Total count", buildStatsLine({
-            critical: lodash.sumBy(reposWithIssues, (it) => { var _a; return (_a = it.issueCountsBySeverity.critical) !== null && _a !== void 0 ? _a : 0; }),
-            high: lodash.sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.high),
-            medium: lodash.sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.medium),
-            low: lodash.sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.low),
+        reporter.info(sprintf("%-70s %s", "Total count", buildStatsLine({
+            critical: sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.critical ?? 0),
+            high: sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.high),
+            medium: sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.medium),
+            low: sumBy(reposWithIssues, (it) => it.issueCountsBySeverity.low),
         })));
         reporter.info("Issues by project:");
         byProjects.forEach((repos) => {
             const project = repos[0].project;
             const totalCount = {
-                critical: lodash.sumBy(repos, (it) => { var _a; return (_a = it.repo.issueCountsBySeverity.critical) !== null && _a !== void 0 ? _a : 0; }),
-                high: lodash.sumBy(repos, (it) => it.repo.issueCountsBySeverity.high),
-                medium: lodash.sumBy(repos, (it) => it.repo.issueCountsBySeverity.medium),
-                low: lodash.sumBy(repos, (it) => it.repo.issueCountsBySeverity.low),
+                critical: sumBy(repos, (it) => it.repo.issueCountsBySeverity.critical ?? 0),
+                high: sumBy(repos, (it) => it.repo.issueCountsBySeverity.high),
+                medium: sumBy(repos, (it) => it.repo.issueCountsBySeverity.medium),
+                low: sumBy(repos, (it) => it.repo.issueCountsBySeverity.low),
             };
             reporter.info("");
-            reporter.info(sprintfJs.sprintf("%-70s %s", getProjectName(project), buildStatsLine(totalCount)));
+            reporter.info(sprintf("%-70s %s", getProjectName(project), buildStatsLine(totalCount)));
             for (const { repo } of repos) {
-                reporter.info(sprintfJs.sprintf("  %-68s %s", repo.name, buildStatsLine(repo.issueCountsBySeverity)));
+                reporter.info(sprintf("  %-68s %s", repo.name, buildStatsLine(repo.issueCountsBySeverity)));
             }
         });
     }
@@ -3321,7 +3262,7 @@ async function setToken({ reporter, token, tokenProvider, }) {
         reporter.info("Need API token to talk to Snyk");
         reporter.info("See https://app.snyk.io/account");
         token = await new Promise((resolve, reject) => {
-            read__default["default"]({
+            read({
                 prompt: "Enter new Snyk API token: ",
                 silent: true,
             }, (err, answer) => {
@@ -3393,30 +3334,17 @@ Notes:
   and provide a link to generate one:
   $ cals snyk set-token`),
     handler: () => {
-        yargs__default["default"].showHelp();
+        yargs(hideBin(process.argv)).showHelp();
     },
 };
 
 async function main() {
-    if (!semver__default["default"].satisfies(process.version, engines.node)) {
+    if (!semver.satisfies(process.version, engines.node)) {
         console.error(`Required node version ${engines.node} not satisfied with current version ${process.version}.`);
         process.exit(1);
     }
-    // http://patorjk.com/software/taag/#p=display&f=Slant&t=CALS
-    const header = `
-      _________    __   _____
-     / ____/   |  / /  / ___/
-    / /   / /| | / /   \\__ \\
-   / /___/ ___ |/ /______/ /
-   \\____/_/  |_/_____/____/
-     cli ${version}
-     built ${"2024-12-05T12:13:34+0000"}
-
-https://github.com/capralifecycle/cals-cli/
-
-Usage: cals <command>`;
-    await yargs__default["default"]
-        .usage(header)
+    await yargs(hideBin(process.argv))
+        .usage(`cals-cli v${version} (build: ${"2024-12-11T13:09:43+0000"})`)
         .scriptName("cals")
         .locale("en")
         .help("help")
@@ -3441,12 +3369,6 @@ Usage: cals <command>`;
     })
         .parse();
 }
-// Definer prosjekt-navn
-// Definer ønskede miljøer
-// Baselines som skal brukse
-// Er bruker logget inn?
-// Lag repo og endre commit
-// Osv. osv. osv.
 
 void main();
-//# sourceMappingURL=cals-cli.js.map
+//# sourceMappingURL=cals-cli.mjs.map