@digigov/cli-lab 2.0.0 → 2.0.2-0138f8bd

package/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@digigov/cli-lab",
   "entries": [
+    {
+      "version": "2.0.1",
+      "tag": "@digigov/cli-lab_v2.0.1",
+      "date": "Tue, 19 Dec 2023 15:00:14 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Upgrade rush and fs-extra"
+          }
+        ]
+      }
+    },
     {
       "version": "2.0.0",
       "tag": "@digigov/cli-lab_v2.0.0",

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @digigov/cli-lab
 
-This log was last generated on Fri, 15 Dec 2023 15:23:56 GMT and should not be manually modified.
+This log was last generated on Tue, 19 Dec 2023 15:00:14 GMT and should not be manually modified.
+
+## 2.0.1
+Tue, 19 Dec 2023 15:00:14 GMT
+
+### Patches
+
+- Upgrade rush and fs-extra
 
 ## 2.0.0
 Fri, 15 Dec 2023 15:23:56 GMT

package/index.mjs

@@ -1,19 +1,21 @@
 #!/usr/bin/env zx
 import "zx-extra";
 import "./lib/extra/index.mjs";
-async function runScript(script){
-  const scriptLocation = path.join(__dirname, 'scripts', script+'.mjs')
-  await spawn(`zx`, [scriptLocation], {stdio: 'inherit'})
+import { spawnSync } from "child_process";
 
+async function runScript(script) {
+  const scriptLocation = path.join(__dirname, "scripts", script + ".mjs");
+  spawnSync(`zx`, [scriptLocation], { stdio: "inherit" });
 }
-if(argv.script) {
-  await runScript(argv.script)
-}else {
-  const scripts = (await find(
-    path.join(__dirname, 'scripts', '*.mjs')
-  )).map(
-    filePath => filePath.replace(path.join(__dirname, 'scripts/'), '').replace('.mjs', '')
-  )
-  const script = await select('Select script', scripts)
-  await runScript(script)
+if (argv.script) {
+  await runScript(argv.script);
+} else {
+  const scripts = (await find(path.join(__dirname, "scripts", "*.mjs"))).map(
+    (filePath) =>
+      filePath
+        .replace(path.join(__dirname, "scripts/"), "")
+        .replace(".mjs", ""),
+  );
+  const script = await select("Select script", scripts);
+  await runScript(script);
 }

package/lib/changed-packages/index.mjs

@@ -1,24 +1,45 @@
 #!/usr/bin/env zx
 import "zx-extra";
 import "../extra/index.mjs";
-export default async function changedPackages(targetBranch) {
-  const rushJSON = await readJSON(await findUp('rush.json'));
-  const getDiffedPackages = reduceScripts(targetBranch, rushJSON.projects);
-  return getDiffedPackages;
+import { spawn } from "child_process";
+
+export default async function getChangedPackages(targetBranch) {
+  const rushJSON = await readJSON(await findUp("rush.json"));
+  return await diffAllPackages(targetBranch, rushJSON.projects);
 }
 
-function reduceScripts(customTargetBranch, projects) {
-  let targetBranch = customTargetBranch || process.env.CI_DEFAULT_BRANCH || 'origin/main';
-  targetBranch = `origin/${targetBranch.replace(/^origin\//, '')}`;
-  return projects.reduce((allPackages, project) => {
-    const {
-      projectFolder
-    } = project
-    const { stdout } = spawn('git', ['diff', '--merge-base', targetBranch, '--', projectFolder])
-    if (!stdout.toString().trim()) {
-      return allPackages
-    }
-    allPackages.push(projectFolder)
-    return allPackages;
-  }, [])
+async function diffAllPackages(customTargetBranch, projects) {
+  let targetBranch =
+    customTargetBranch || process.env.CI_DEFAULT_BRANCH || "origin/main";
+  targetBranch = targetBranch.replace(/^origin\//, "");
+
+  const allPackages = await Promise.all(
+    projects.map((project) => {
+      return new Promise((resolve, reject) => {
+        const { projectFolder } = project;
+        const diffProcess = spawn("git", [
+          "diff",
+          "--merge-base",
+          targetBranch,
+          "--",
+          projectFolder,
+        ]);
+        let output = "";
+        diffProcess.stdout.on("data", (data) => {
+          output += data.toString();
+        });
+        diffProcess.stderr.on("data", (data) => {
+          reject(data.toString());
+        });
+
+        diffProcess.on("close", (code) => {
+          if (code !== 0) return reject(`git diff exited with code ${code}`);
+          if (output.trim()) return resolve(projectFolder);
+          else return resolve(null);
+        });
+      });
+    }),
+  );
+
+  return allPackages.filter(Boolean);
 }

package/lib/extra/index.mjs

@@ -1,80 +1,115 @@
-import { $ } from 'zx';
-import inquirer from 'inquirer';
-import glob from 'glob';
-import path from 'path';
-import { spawnSync } from 'child_process';
-import fs from 'fs-extra';
+import { $ } from "zx";
+import * as inquirer from "@inquirer/prompts";
+import glob from "globby";
+import path from "path";
+import { spawnSync } from "child_process";
+import fs from "fs-extra";
+
 const errorOffset = 1000;
+
+/**
+ * Create a CLI command
+ *
+ * This creates a proxy object that allows you to call CLI commands
+ * as if they were functions. Under the hood, it uses `spawnSync` to
+ * run the command and return the result
+ *
+ * @param {string} commandName
+ * @returns {Proxy} a proxy object for the CLI command
+ */
 function createCli(commandName) {
-  return new Proxy({}, {
-    get: (_, command) => {
-      return async function (args, options) {
-        if (args) {
-          args = args.split(' ');
-        } else {
-          args = []
-        }
-        const result = spawnSync(commandName, [command, ...args], { shell: true, stdio: options?.json || options?.stdout ? 'pipe' : ['inherit', 'inherit', 'pipe'], env: options?.env || process.env });
-        if (result.status !== 0 && result.stderr) {
-          const errMsg = result.stderr.toString();
-          if (errMsg.includes('Error: ')) {
-            const idx = errMsg.substring(errMsg.indexOf('Error: '));
-            throw new Error(errMsg.substring(idx, idx + errorOffset))
+  return new Proxy(
+    {},
+    {
+      get: (_, command) => {
+        return async function (args, options) {
+          if (args) {
+            args = args.split(" ");
           } else {
-            throw new Error(result.stderr.toString());
+            args = [];
           }
-        }
-        if (options?.json) {
-          return JSON.parse(result.stdout);
-        }
-        if (options?.stdout) {
-          return result.stdout.toString();
-        }
-      }
-
-    }
-  })
+          const result = spawnSync(commandName, [command, ...args], {
+            shell: true,
+            stdio:
+              options?.json || options?.stdout
+                ? "pipe"
+                : ["inherit", "inherit", "pipe"],
+            env: options?.env || process.env,
+          });
+          if (result.status !== 0 && result.stderr) {
+            const errMsg = result.stderr.toString();
+            if (errMsg.includes("Error: ")) {
+              const idx = errMsg.substring(errMsg.indexOf("Error: "));
+              throw new Error(errMsg.substring(idx, idx + errorOffset));
+            } else {
+              throw new Error(result.stderr.toString());
+            }
+          }
+          if (options?.json) {
+            return JSON.parse(result.stdout);
+          }
+          if (options?.stdout) {
+            return result.stdout.toString();
+          }
+        };
+      },
+    },
+  );
 }
-console.clear();
 global.find = async (patterns, options) => {
   return glob.sync(patterns, options);
 };
 global.mkdir = async (dir) => {
-  fs.mkdirSync(dir)
-}
+  fs.mkdirSync(dir);
+};
 global.rm = async (fileOrDir) => {
-  console.log('removing ' + fileOrDir)
-  return fs.rmdir(fileOrDir, {
-    recursive: true
-  })
-}
-global.confirm = async (question) => (await inquirer.prompt({ type: 'confirm', message: question, name: 'var' })).var;
-global.question = async (question, value) => (await inquirer.prompt({
-  type: 'input', message: question, name: 'var', default: value
-})).var;
-global.password = async (question) => (await inquirer.prompt({ type: 'password', message: question, name: 'var' })).var;
+  console.log("removing " + fileOrDir);
+  return fs.rm(fileOrDir, {
+    recursive: true,
+  });
+};
+global.confirm = (question) => inquirer.confirm({ message: question });
+global.question = (question, value) =>
+  inquirer.input({
+    message: question,
+    default: value,
+  });
+global.password = (question) => inquirer.password({ message: question });
 
-global.select = async (question, choices, values) => (
-  await inquirer.prompt({
-    type: 'list', message: question, name: 'var', choices,
-    default: values
-  })).var;
-global.checkbox = async (question, choices, values) => (await inquirer.prompt({
-  type: 'checkbox', message: question, name: 'var', choices,
-  default: values
-})).var;
+global.select = (question, choices, values) =>
+  inquirer.select({
+    message: question,
+    choices,
+    default: values,
+  });
+global.checkbox = (question, choices) =>
+  inquirer.checkbox({
+    message: question,
+    choices,
+  });
 
-global.cli = new Proxy({}, {
-  get: (_, commandName) => {
-    return createCli(commandName);
-  }
-});
+global.cli = new Proxy(
+  {},
+  {
+    get: (_, commandName) => {
+      return createCli(commandName);
+    },
+  },
+);
 global.pwd = async () => (await $`pwd`).stdout;
 global.path = path;
-global.cd = (p) => { process.chdir(p); };
-global.readJSON = async (file) => { return fs.readJSONSync(file); };
-global.readFile = async (file) => { return fs.readFileSync(file).toString(); };
-global.writeFile = async (file, content) => { return fs.outputFileSync(file, content); };
+global.cd = (p) => {
+  process.chdir(p);
+};
+global.readJSON = async (file) => {
+  return fs.readJSONSync(file);
+};
+global.readFile = async (file) => {
+  return fs.readFileSync(file).toString();
+};
+global.writeFile = async (file, content) => {
+  return fs.outputFileSync(file, content);
+};
 global.findUp = function findFileInParentDirectories(fileName, rootDir) {
   let currentDir = rootDir || process.cwd();
   while (currentDir) {
@@ -101,10 +136,9 @@ global.requireEnv = async (key, required, options) => {
   return val;
 };
 
-global.spawn = spawnSync
+global.spawn = spawnSync;
 
-process.on('SIGINT', function () {
+process.on("SIGINT", function () {
   console.log("Caught interrupt signal");
   process.exit();
-
-});
+});

package/package.json

@@ -1,25 +1,27 @@
 {
   "name": "@digigov/cli-lab",
-  "version": "2.0.0",
+  "version": "2.0.2-0138f8bd",
   "description": "",
   "main": "index.mjs",
   "type": "module",
   "directories": {
     "lib": "lib"
   },
-  "scripts": {
-    "publint": "publint",
-    "lab": "zx index.mjs"
-  },
   "author": "",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "@microsoft/rush-lib": "5.83.3",
-    "zx": "2.0.0",
-    "zx-extra": "0.0.4",
-    "inquirer": "8.1.2",
-    "glob": "7.1.6",
-    "fs-extra": "10.0.0",
+    "@microsoft/rush-lib": "5.151.0",
+    "zx": "7.2.3",
+    "zx-extra": "3.0.23",
+    "@inquirer/prompts": "7.0.1",
+    "globby": "11.0.0",
+    "fs-extra": "11.2.0"
+  },
+  "devDependencies": {
     "publint": "0.1.8"
+  },
+  "scripts": {
+    "publint": "publint",
+    "lab": "zx index.mjs"
   }
-}
+}