bdy 1.18.15-stage → 1.18.17-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.15-stage",
+  "version": "1.18.17-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/command/login.js

@@ -9,6 +9,7 @@ const node_http_1 = __importDefault(require("node:http"));
 const texts_1 = require("../texts");
 const utils_1 = require("../utils");
 const input_1 = __importDefault(require("../input"));
+const logger_1 = __importDefault(require("../logger"));
 const OAUTH_CLIENT_APP_PORT = 7596;
 const OAUTH_CLIENT_APP_HOST = 'localhost';
 const OAUTH_CLIENT_APP_REDIRECT_URL = `http://localhost:${OAUTH_CLIENT_APP_PORT}`;
@@ -138,6 +139,7 @@ commandLogin.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
 commandLogin.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandLogin.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandLogin.action(async (options) => {
+    logger_1.default.info(options);
     output_1.default.handleSignals();
     cfg_1.default.clearLogin();
     let api = options.api || process.env.BUDDY_API_ENDPOINT;

package/distTs/src/index.js

@@ -27,6 +27,7 @@ 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);
 process.title = 'bdy';
 process.on('uncaughtException', (err) => {
@@ -56,6 +57,9 @@ 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);
 }

package/distTs/src/main.js

@@ -0,0 +1,170 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const output_1 = __importDefault(require("./output"));
+const selectCommand = async (parentCommand) => {
+    let items = [];
+    const map = {};
+    parentCommand.commands.forEach((c) => {
+        const name = c.name();
+        map[name] = c;
+        items.push({
+            name,
+            description: c.description(),
+            value: name,
+        });
+    });
+    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 (name === 'help') {
+        parentCommand.help();
+        output_1.default.exitNormal();
+    }
+    const cmd = map[name];
+    if (cmd.commands.length > 0) {
+        return await selectCommand(cmd);
+    }
+    return cmd;
+};
+const setOptionValue = async (opt) => {
+    if (opt.isBoolean()) {
+        const val = await output_1.default.inputMenu('Value', ['true', 'false']);
+        return val === 0;
+    }
+    else {
+        return await output_1.default.inputString('Value', opt.defaultValue);
+    }
+};
+const nameToCamelCase = (name) => {
+    const s = name.split('-');
+    if (s.length <= 1)
+        return name;
+    return s
+        .map((txt, i) => {
+        if (!txt || !txt.length || !i)
+            return txt;
+        return `${txt[0].toUpperCase()}${txt.substring(1)}`;
+    })
+        .join('');
+};
+const camelCaseToName = (cc) => {
+    return cc.replace(/[A-Z]/g, (char) => `-${char.toLowerCase()}`);
+};
+const selectOptions = async (cmd) => {
+    const options = {};
+    if (cmd.options.length > 0) {
+        const map = {};
+        let items = [];
+        cmd.options.forEach((opt) => {
+            const name = opt.name();
+            map[name] = opt;
+            items.push({
+                name,
+                description: opt.description,
+                value: name,
+            });
+        });
+        items = items.sort((a, b) => a.name.localeCompare(b.name));
+        items.unshift({
+            name: 'Go next',
+            value: '',
+        });
+        while (true) {
+            const name = await output_1.default.inputMenuAdv('Option', items);
+            if (map[name]) {
+                const opt = map[name];
+                const value = await setOptionValue(opt);
+                const cc = nameToCamelCase(name);
+                if (opt.variadic) {
+                    if (!options[cc])
+                        options[cc] = [];
+                    const o = options[cc];
+                    o.push(value);
+                }
+                else {
+                    options[cc] = value;
+                }
+            }
+            else {
+                break;
+            }
+        }
+    }
+    return options;
+};
+const selectArguments = async (cmd) => {
+    const args = [];
+    if (cmd.registeredArguments.length > 0) {
+        for (let i = 0; i < cmd.registeredArguments.length; i += 1) {
+            const arg = cmd.registeredArguments[i];
+            let desc = arg.name();
+            if (arg.description)
+                desc += ` - ${arg.description}`;
+            desc += ':';
+            const value = await output_1.default.inputString(`${desc[0].toUpperCase()}${desc.substring(1)}`, arg.defaultValue, arg.required);
+            if (arg.variadic) {
+                args.push(value.split(' '));
+            }
+            else {
+                args.push(value);
+            }
+        }
+    }
+    return args;
+};
+const outputFinalCommand = (cmd, options, args) => {
+    let txt = '';
+    let c = cmd;
+    while (c !== null) {
+        txt = c.name() + ' ' + txt;
+        c = c.parent;
+    }
+    txt = txt.trim();
+    Object.entries(options).forEach(([name, val]) => {
+        const n = camelCaseToName(name);
+        if (val === true) {
+            txt += ` --${n}`;
+        }
+        else if (val === false) {
+            txt += ` --${n}=false`;
+        }
+        else if (Array.isArray(val)) {
+            val.forEach((v) => {
+                txt += ` --${n}="${v}"`;
+            });
+        }
+        else {
+            txt += ` --${n}="${val}"`;
+        }
+    });
+    args.forEach((arg) => {
+        if (Array.isArray(arg)) {
+            txt += ` ${arg.map(a => `"${a}"`).join(' ')}`;
+        }
+        else {
+            txt += ` "${arg}"`;
+        }
+    });
+    output_1.default.cyan('❯ ', false);
+    output_1.default.normal(txt);
+};
+const main = async (program) => {
+    if (!output_1.default.isTTY()) {
+        program.help();
+        output_1.default.exitNormal();
+    }
+    const cmd = await selectCommand(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);
+    await cmd._actionHandler([...args, options, cmd]);
+};
+exports.default = main;

package/distTs/src/output.js

@@ -259,10 +259,11 @@ class Output {
         this.cyan(` No`);
         return false;
     }
-    static async inputString(message, def) {
+    static async inputString(message, def, required) {
         if (this.isStdInTTY()) {
             const prompts = require('@inquirer/prompts');
             return await prompts.input({
+                required,
                 message,
                 default: def,
                 theme: this.getInquirerTheme(),

package/distTs/src/tunnel/cfg.js

@@ -254,6 +254,7 @@ class Cfg {
         delete this.json.apiClientToken;
         delete this.json.workspace;
         delete this.json.baseUrl;
+        delete this.json.token;
         this.save();
     }
     getWhitelist() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.15-stage",
+  "version": "1.18.17-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {