bdy 1.18.20-stage → 1.18.22-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.20-stage",
+  "version": "1.18.22-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -66,7 +66,6 @@
     "range-parser": "1.2.1",
     "socket.io-client": "4.7.5",
     "ssh2": "1.15.0",
-    "tabtab": "3.0.2",
     "tar-stream": "3.1.7",
     "terminal-kit": "3.1.1",
     "undici": "6.23.0",
@@ -96,7 +95,6 @@
     "@types/punycode": "2.1.4",
     "@types/range-parser": "1.2.1",
     "@types/ssh2": "1.15.5",
-    "@types/tabtab": "3.0.2",
     "@types/tar-stream": "3.1.4",
     "@types/terminal-kit": "2.5.6",
     "@types/unzipper": "0.10.11",

package/distTs/src/index.js

@@ -24,8 +24,6 @@ const project_1 = __importDefault(require("./command/project"));
 const whoami_1 = __importDefault(require("./command/whoami"));
 const package_1 = __importDefault(require("./command/package"));
 const api_1 = __importDefault(require("./command/api"));
-const autocomplete_1 = __importDefault(require("./autocomplete"));
-const autocomplete_2 = __importDefault(require("./command/autocomplete"));
 const domain_1 = __importDefault(require("./command/domain"));
 const main_1 = __importDefault(require("./main"));
 stream_1.default.setDefaultHighWaterMark(false, 67108864);
@@ -56,11 +54,7 @@ program.addCommand(logout_1.default);
 program.addCommand(workspace_1.default);
 program.addCommand(project_1.default);
 program.addCommand(api_1.default);
-program.addCommand(autocomplete_2.default);
 program.action(async () => {
     await (0, main_1.default)(program);
 });
-if (autocomplete_1.default.init(program)) {
-    process.exit(0);
-}
 program.parse();

package/distTs/src/main.js

@@ -7,7 +7,7 @@ const output_1 = __importDefault(require("./output"));
 const selectCommand = async (parentCommand) => {
     let items = [];
     const map = {};
-    parentCommand.commands.forEach((c) => {
+    parentCommand.commands.filter((c) => !c._hidden).forEach((c) => {
         const name = c.name();
         map[name] = c;
         items.push({
@@ -16,17 +16,29 @@ const selectCommand = async (parentCommand) => {
             value: name,
         });
     });
+    items = items.sort((a, b) => a.name.localeCompare(b.name));
+    const goBack = 'go back';
     items.push({
         name: 'help',
         description: 'Display help for current command',
         value: 'help',
     });
-    items = items.sort((a, b) => a.name.localeCompare(b.name));
-    const name = await output_1.default.inputMenuAdv('Command', items);
+    if (parentCommand.parent) {
+        items.unshift({
+            name: goBack,
+            description: 'Go back to parent command',
+            value: goBack
+        });
+    }
+    output_1.default.clearPreviousLine();
+    const name = await output_1.default.inputMenuAdv(getFinalCommand(parentCommand, {}, []), items);
     if (name === 'help') {
         parentCommand.help();
         output_1.default.exitNormal();
     }
+    else if (name === goBack && parentCommand.parent) {
+        return await selectCommand(parentCommand.parent);
+    }
     const cmd = map[name];
     if (cmd.commands.length > 0) {
         return await selectCommand(cmd);
@@ -34,12 +46,17 @@ const selectCommand = async (parentCommand) => {
     return cmd;
 };
 const setOptionValue = async (opt) => {
+    output_1.default.clearPreviousLine();
+    let name = opt.name();
+    const desc = opt.description;
+    if (desc)
+        name += ` (${desc})`;
     if (opt.isBoolean()) {
-        const val = await output_1.default.inputMenu('Value', ['true', 'false']);
+        const val = await output_1.default.inputMenu(`--${name}`, ['true', 'false']);
         return val === 0;
     }
     else {
-        return await output_1.default.inputString('Value', opt.defaultValue);
+        return await output_1.default.inputString(`--${name}:`, opt.defaultValue);
     }
 };
 const nameToCamelCase = (name) => {
@@ -66,18 +83,19 @@ const selectOptions = async (cmd) => {
             const name = opt.name();
             map[name] = opt;
             items.push({
-                name,
+                name: `--${name}`,
                 description: opt.description,
                 value: name,
             });
         });
         items = items.sort((a, b) => a.name.localeCompare(b.name));
         items.unshift({
-            name: 'Go next',
+            name: 'Skip options',
             value: '',
         });
         while (true) {
-            const name = await output_1.default.inputMenuAdv('Option', items);
+            output_1.default.clearPreviousLine();
+            const name = await output_1.default.inputMenuAdv(getFinalCommand(cmd, options, []), items);
             if (map[name]) {
                 const opt = map[name];
                 const value = await setOptionValue(opt);
@@ -108,6 +126,7 @@ const selectArguments = async (cmd) => {
             if (arg.description)
                 desc += ` - ${arg.description}`;
             desc += ':';
+            output_1.default.clearPreviousLine();
             const value = await output_1.default.inputString(`${desc[0].toUpperCase()}${desc.substring(1)}`, arg.defaultValue, arg.required);
             if (arg.variadic) {
                 args.push(value.split(' '));
@@ -119,7 +138,7 @@ const selectArguments = async (cmd) => {
     }
     return args;
 };
-const outputFinalCommand = (cmd, options, args) => {
+const getFinalCommand = (cmd, options, args) => {
     let txt = '';
     let c = cmd;
     while (c !== null) {
@@ -152,8 +171,7 @@ const outputFinalCommand = (cmd, options, args) => {
             txt += ` "${arg}"`;
         }
     });
-    output_1.default.cyan('❯ ', false);
-    output_1.default.normal(txt);
+    return txt;
 };
 const main = async (program) => {
     if (!output_1.default.isTTY()) {
@@ -164,7 +182,9 @@ const main = async (program) => {
     const options = await selectOptions(cmd);
     const args = await selectArguments(cmd);
     Object.entries(options).forEach(([k, v]) => cmd.setOptionValue(camelCaseToName(k), v));
-    outputFinalCommand(cmd, options, args);
+    output_1.default.clearPreviousLine();
+    output_1.default.cyan('❯ ', false);
+    output_1.default.normal(getFinalCommand(cmd, options, args));
     await cmd._actionHandler([...args, options, cmd]);
 };
 exports.default = main;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.20-stage",
+  "version": "1.18.22-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -66,7 +66,6 @@
     "range-parser": "1.2.1",
     "socket.io-client": "4.7.5",
     "ssh2": "1.15.0",
-    "tabtab": "3.0.2",
     "tar-stream": "3.1.7",
     "terminal-kit": "3.1.1",
     "undici": "6.23.0",
@@ -96,7 +95,6 @@
     "@types/punycode": "2.1.4",
     "@types/range-parser": "1.2.1",
     "@types/ssh2": "1.15.5",
-    "@types/tabtab": "3.0.2",
     "@types/tar-stream": "3.1.4",
     "@types/terminal-kit": "2.5.6",
     "@types/unzipper": "0.10.11",