bcup-cli 1.1.2 → 1.3.0

package/bin/bcup-cli

@@ -1,4 +1,2 @@
-#!/usr/bin/env node
-
-require = require('esm')(module /*, options*/);
-require('../src/cli.ts').cli(process.argv);
+#!/bin/bash
+exec npx tsx src/cli.ts "$@"

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "bcup-cli",
-  "version": "1.1.2",
+  "version": "1.3.0",
   "description": "Lightweight Buttercup password manager cli",
+    "type": "module",
   "bin": {
-    "bcup-cli": "bin/bcup-cli"
+    "bcup-cli": "bin/cli.mjs"
   },
   "main": "index.js",
   "scripts": {
@@ -25,15 +26,18 @@
   "dependencies": {
     "@types/node": "^13.9.2",
     "arg": "^4.1.3",
-    "buttercup": "^5.6.0",
+    "buttercup": "^7.7.1",
     "chalk": "^4.1.0",
     "clipboardy": "^2.3.0",
     "config": "^3.3.0",
     "crypto-random-string": "^3.3.0",
-    "esm": "^3.2.25",
     "global": "^4.4.0",
     "js-yaml": "^3.13.1",
     "lodash": "^4.17.15",
-    "prompt-sync": "^4.2.0"
+    "prompt-sync": "^4.2.0",
+    "prompt-sync-history": "^1.0.1"
+  },
+  "devDependencies": {
+    "tsx": "^4.21.0"
   }
 }

package/src/cli.ts

@@ -1,20 +1,25 @@
 #!/usr/bin/env node
 
 import arg from 'arg';
-import { flatten, uniqBy } from 'lodash';
+import flatten from 'lodash/flatten';
+import uniqBy from 'lodash/uniqBy';
 import { name, version, description, author, license, repository } from '../package.json';
+import { Vault, FileDatasource, Credentials, init } from 'buttercup';
+import { homedir } from 'os';
+import clipboardy from 'clipboardy'
+import chalk from 'chalk'
+import promptSync from 'prompt-sync';
+import history from 'prompt-sync-history';
 
 export function cli(args) {
   const options = parseArgumentsIntoOptions(args);
   const debug = options.debug || false;
   if (debug) console.log(args);
-  const homedir = require('os').homedir();
-  const bcupFile = options.bcupPath || `${homedir}/.bcup-cli/vault.bcup`;
+  const bcupFile = options.bcupPath || `${homedir()}/.bcup-cli/vault.bcup`;
 
-  const { Vault, FileDatasource, Credentials, init, Search } = require('buttercup');
-  const clipboardy = require('clipboardy');
-  const chalk = require('chalk');
-  const prompt = require('prompt-sync')();
+  const prompt = promptSync({
+    history: history() //open history file
+  });
 
   console.log(`= ${name} v${version} (${description}) =`);
   console.log(`author: ${author}`);
@@ -34,6 +39,8 @@ export function cli(args) {
 
   let num;
   let entries;
+  let titleSearch;
+  let promptText;
   try {
     fileDatasource
       .load(credentials)
@@ -41,7 +48,9 @@ export function cli(args) {
       .then(vault => {
         do {
           console.log("\n");
-          const titleSearch = prompt('Search text in folder or title. You can use RegExp: ')
+          promptText = `Search text in folder or title. You can use RegExp (${titleSearch}): `
+          titleSearch = prompt(promptText, titleSearch);
+          prompt.history.save();
           const re = new RegExp(titleSearch, 'i');
           entries = vault.findEntriesByProperty('title', re);
           const groups = vault.findGroupsByTitle(re);
@@ -61,13 +70,13 @@ export function cli(args) {
 
           console.log("\n");
           do {
-            num = prompt('Select entry to copy or enter for search again: ')
+            num = prompt('Select entry to copy or press enter to search again: ')
             if (debug) console.log('num: "'+ num + '"');
-            if (num == undefined || (num.length > 0 && (!num.match(/\d+/) || num > entries.length || num < 0))) {
+            if (invalidSelection(num, entries.length)) {
               console.log(`wrong selection (0-${entries.length})`)
             }
             if (num === '0') return;
-          } while (num == undefined || num.length > 0 && (!num.match(/\d+/) || num > entries.length || num < 0))
+          } while (invalidSelection(num, entries.length))
           if (num === '') continue;
           const pass = entries[num - 1].getProperty('password');
           clipboardy.writeSync(pass);
@@ -79,8 +88,11 @@ export function cli(args) {
     }
 }
 
+function invalidSelection(num, max) {
+  return num == undefined || (num.length > 0 && (!num.match(/\d+/) || num > max || num < 0))
+}
+
 function emphSearch(string, titleSearch) {
-  const chalk = require('chalk');
   const re = new RegExp(titleSearch, 'ig');
 
   let res;
@@ -108,3 +120,5 @@ function parseArgumentsIntoOptions(rawArgs) {
    bcupPath: args['--bcup-path'],
  };
 }
+
+cli(process.argv);