scriptpal 1.2.2 → 1.3.1

package/README.md

@@ -8,7 +8,7 @@ A simple npm script palette for lazy people who want a quick way to look through
 
 - keyboard navigation
 - autocompletion
-- fussy finding
+- fuzzy finding
 
 <p align="center">
   <img width="580" src="assets/demo.gif" alt="Demo">
@@ -22,7 +22,7 @@ Install globally
 npm install -g scriptpal
 ```
 
-## Get started 🏁
+## Usage 🏁
 
 ```bash
 scriptpal
@@ -33,3 +33,22 @@ Usage with npx
 ```bash
 npx scriptpal
 ```
+
+## API 🤖
+
+- `--nowelcome`, `-n` Omit welcome message
+- `--last`, `-l` Run previous command
+- `--version`, `-v` Version number
+- `--clipboard`, `-c` Copy command to clipboard
+- `--help` Help me 🙏
+
+## Examples
+
+- `$ scriptpal --nowelcome`
+- `$ npx scriptpal`
+- `$ scriptpal --last --preset="emoji"`
+
+## You might also like...
+
+- [CommitPal](https://github.com/zeropoly/commitpal): A delightful CLI tool for building complex commit messages
+- [Enquirer](https://github.com/enquirer/enquirer): Stylish, intuitive and user-friendly prompts

package/bin/index.js

@@ -1,82 +1,141 @@
 #!/usr/bin/env node
 "use strict";
 
-const { spawnSync } = require('child_process');
-const { AutoComplete, Snippet } = require("enquirer");
+const { spawnSync } = require("child_process");
+const { AutoComplete, Snippet, Confirm } = require("enquirer");
 const clipboardy = require("clipboardy");
 const meow = require("meow");
+const Conf = require("conf");
+const chalk = require("chalk");
 
 const welcome = require("./welcome");
 const { getPackageJson, hasFile } = require("./file-manager");
 
-async function main(input, flags) {
-  if (!flags.nowelcome) welcome();
+const promptShouldRerunPrevious = async (previous) => {
+  const previousCommand = `${previous.script} ${
+    previous.parameters || ""
+  }`.trim();
 
-  const packageJson = getPackageJson();
+  return await new Confirm({
+    message: `Would you like to rerun the previous command?\n${chalk.greenBright(
+      previousCommand
+    )}`,
+  }).run();
+};
 
+const promptGetCommand = async (choices) => {
   const script = await new AutoComplete({
-    name: "flavor",
     message: "Which script would you like to run? 🤷‍♂️",
     limit: 18,
-    choices: Object.keys(packageJson.scripts)
+    choices,
   }).run();
 
-  const { values: { parameters } } = await new Snippet({
-    name: 'command',
-    message: 'Would you like to add parameters?',
+  const {
+    values: { parameters },
+  } = await new Snippet({
+    message: "Would you like to add parameters?",
     required: false,
-    fields: [{
-      name: 'parameters',
-      message: 'parameters'
-    }],
-    template: `${script} \${parameters}`
+    fields: [
+      {
+        name: "parameters",
+        message: "parameters",
+      },
+    ],
+    template: `${script} \${parameters}`,
   }).run();
 
+  return {
+    script,
+    parameters,
+  };
+};
+
+async function main(input, flags) {
+  if (!flags.nowelcome) welcome();
+
+  const packageJson = getPackageJson();
+  const choices = Object.keys(packageJson.scripts);
+
+  const config = new Conf();
+  const previous = config.get(`${process.cwd()}.previous`);
+
+  let shouldRerunPrevious = false;
+
+  if (!previous && flags.last) {
+    console.log("Previous command not found, continuing...\n");
+  } else if (previous && !flags.last) {
+    shouldRerunPrevious = await promptShouldRerunPrevious(previous);
+  } else {
+    shouldRerunPrevious = true;
+  }
+
+  const { script, parameters } =
+    (previous || flags.last) && shouldRerunPrevious
+      ? previous
+      : await promptGetCommand(choices);
+
   const isYarn = hasFile("yarn.lock");
   const packageManager = isYarn ? "yarn" : "npm";
-  let args = !isYarn ? ['run', script] : [script];
+  let args = !isYarn ? ["run", script] : [script];
 
   args = parameters ? [...args, parameters] : args;
 
   if (flags.clipboard) {
-    await clipboardy.write(`${packageManager} ${args.join(' ')}`);
+    await clipboardy.write(`${packageManager} ${args.join(" ")}`);
     console.log("Copied to clipboard 👉 📋");
-  } else {
-    const spawn = spawnSync(packageManager, args, { stdio: "inherit" });
+    return 0;
+  }
+
+  const spawn = spawnSync(packageManager, args, { stdio: "inherit" });
 
-    if (spawn.error) {
-      console.error(spawn.error);
-      return 1;
-    }
+  if (spawn.error) {
+    throw new Error(spawn.error);
   }
+
+  config.set(`${process.cwd()}.previous`, { script, parameters });
 }
 
-const cli = meow(`
+const cli = meow(
+  `
   Usage
     $ scriptpal
 
   Options
+    --last, -l  Run previous command
+    --clipboard, -c Copy command to clipboard
     --nowelcome, -n  Omit welcome message
+    --version Version number
     --help  Help me
-    --version, -v  Version number
-    --clipboard, -c Copy command to clipboard
 
   Examples
     $ scriptpal --nowelcome
     $ npx scriptpal
+    $ scriptpal --last --preset="emoji"
 `,
   {
     flags: {
       nowelcome: {
         type: "boolean",
-        alias: "n"
+        alias: "n",
       },
       clipboard: {
         type: "boolean",
-        alias: "c"
-      }
-    }
+        alias: "c",
+      },
+      last: {
+        type: "boolean",
+        alias: "l",
+      },
+    },
   }
 );
 
-main(cli.input[0], cli.flags);
+(async () => {
+  try {
+    await main(cli.input[0], cli.flags);
+  } catch (error) {
+    console.error(chalk.red(error));
+    console.log(error);
+    process.exit(1);
+  }
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptpal",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "A simple npm script palette for lazy people (like me)",
   "main": "./bin/index.js",
   "bin": {
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "start": "node ./bin/index",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\""
   },
   "author": "Daniel Del Core",
   "repository": {
@@ -29,6 +29,7 @@
   "dependencies": {
     "chalk": "^3.0.0",
     "clipboardy": "^2.1.0",
+    "conf": "^6.2.1",
     "enquirer": "^2.3.2",
     "find-config": "^1.0.0",
     "gradient-string": "^1.2.0",