The help output was indented by unclosed console.group() calls, which Bun keeps applying to every subsequent line. Because groups were never closed with console.groupEnd(), indentation accumulated per nesting level and pushed deep entries (e.g. "jj portainer test") far to the right. Replace the group-based helpers with an explicit INDENT constant and a depth parameter in generateHelp(), so each level is indented deterministically and the layout is stable regardless of console state.
94 lines
3.5 KiB
TypeScript
94 lines
3.5 KiB
TypeScript
import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils";
|
|
import chalk from "chalk";
|
|
import fs from "fs-extra";
|
|
|
|
const cliConfig: any = {};
|
|
|
|
const INDENT = " ";
|
|
|
|
const formatCommandSection = (cmd, prefixCmd, maxLen = 25) => {
|
|
const formattedCmd = prefixCmd ? `${prefixCmd} ${cmd}` : cmd;
|
|
let padding = maxLen - formattedCmd.length;
|
|
if (padding < 0) padding = 0;
|
|
|
|
return "jj " + formattedCmd + " ".repeat(padding);
|
|
};
|
|
|
|
const formatHelpSection = (desc, prefixDesc) => {
|
|
const formattedDesc = prefixDesc ? `${prefixDesc} ${desc}` : desc;
|
|
return formattedDesc;
|
|
};
|
|
|
|
const generateHelp = ({ cmds, prefixCmd = "", prefixDesc = "", depth = 0 }) => {
|
|
const indent = INDENT.repeat(depth);
|
|
for (const cmd of cmds) {
|
|
const commandLabel = cmd?.postCommand ? `${cmd?.key} ${cmd?.postCommand}` : cmd?.key;
|
|
if (cmd?.mainTitle) {
|
|
console.log(indent + chalk.italic.green.bold(cmd.mainTitle));
|
|
if (cmd?.keys?.length > 0) {
|
|
generateHelp({
|
|
cmds: cmd?.keys || [],
|
|
prefixCmd: cmd?.key,
|
|
prefixDesc: cmd?.desc,
|
|
depth: depth + 1,
|
|
});
|
|
} else {
|
|
console.log(indent + INDENT + chalk.bold(formatCommandSection(commandLabel, prefixCmd, cmd?.maxLength), formatHelpSection(cmd?.desc, prefixDesc)));
|
|
}
|
|
} else {
|
|
console.log(indent + chalk.bold(formatCommandSection(commandLabel, prefixCmd, cmd?.maxLength), formatHelpSection(cmd?.desc, prefixDesc)));
|
|
}
|
|
}
|
|
};
|
|
|
|
const cliHelp = async () => {
|
|
if (process.env.JJ_CLI_ARG_2 == "auto-completion") {
|
|
// const aaa = getJJConfigByKeyChain(`commands`)
|
|
console.log(`add this to .zshrc: ===> `);
|
|
console.log(`export JJ_SOURCE_DIR="${process.env.JJ_SOURCE_DIR}"`);
|
|
console.log(`export JJ_DATA_DIR="${process.env.JJ_DATA_DIR}"`);
|
|
console.log(`source ${process.env.JJ_SOURCE_DIR}/bashUtils/auto-completion.sh`);
|
|
return;
|
|
}
|
|
if (process.env.JJ_CLI_ARG_2 == "workDirs") {
|
|
console.log(`JJ_SOURCE_DIR ${process.env.JJ_SOURCE_DIR}`);
|
|
console.log(`JJ_WORKSPACE_DIR ${process.env.JJ_WORKSPACE_DIR}`);
|
|
console.log(`JJ_DATA_DIR ${process.env.JJ_DATA_DIR}`);
|
|
return;
|
|
}
|
|
if (process.env.JJ_CLI_ARG_2 == "version-source") {
|
|
const packageJasonSourceRaw = fs.readFileSync(`${process.env.JJ_SOURCE_DIR}/package.json`, "utf-8");
|
|
const packageJasonSource = JSON.parse(packageJasonSourceRaw);
|
|
console.log(packageJasonSource.version);
|
|
return;
|
|
}
|
|
if (process.env.JJ_CLI_ARG_2 == "version-workspace") {
|
|
const packageJasonWorkspaceRaw = fs.readFileSync(`${process.env.JJ_WORKSPACE_DIR}/package.json`, "utf-8");
|
|
const packageJasonWorkspace = JSON.parse(packageJasonWorkspaceRaw);
|
|
console.log(packageJasonWorkspace.version);
|
|
return;
|
|
}
|
|
if (process.env.JJ_CLI_ARG_2 == "listOfEnvs") {
|
|
const environments = getJJConfigByKeyChain('environments')
|
|
console.log(Object.keys(environments).join("\n"))
|
|
return;
|
|
}
|
|
console.log(chalk.blue.italic.bold("Usage: jj <COMMAND>"));
|
|
console.log(chalk.blue.italic.bold("Commands:"));
|
|
|
|
cliConfig.commandsObject = getJJConfigByKeyChain(`commands`);
|
|
cliConfig.commandList = Object.keys(cliConfig.commandsObject).map((cmdKey) => ({
|
|
key: cmdKey,
|
|
...cliConfig.commandsObject[cmdKey],
|
|
}));
|
|
|
|
generateHelp({
|
|
cmds: cliConfig.commandList,
|
|
depth: 1,
|
|
});
|
|
|
|
return;
|
|
};
|
|
|
|
export default cliHelp;
|