diff --git a/bashUtils/ensureDependency.sh b/bashUtils/ensureDependency.sh index 949d4fc..023541c 100755 --- a/bashUtils/ensureDependency.sh +++ b/bashUtils/ensureDependency.sh @@ -64,7 +64,7 @@ if [[ ! -e $JJ_SOURCE_DIR/~~tmp/deps/bun-packages-installed ]] \ ; then pushd $JJ_WORKSPACE_DIR > /dev/null - bun install --production + bun install popd > /dev/null touch $JJ_SOURCE_DIR/~~tmp/deps/bun-packages-installed jjCliLog jjLogSuccess "Bun dependencies successfully installed" diff --git a/bashUtils/index.sh b/bashUtils/index.sh index 01e8648..4b9ae3e 100755 --- a/bashUtils/index.sh +++ b/bashUtils/index.sh @@ -1,6 +1,6 @@ #!/usr/bin/env zsh -set - +set -e export UNAME="$(uname)" # setopt aliases complete_aliases diff --git a/bun.lockb b/bun.lockb index 91b7960..4e3947e 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/helpers/jjCliYargs.ts b/helpers/jjCliYargs.ts new file mode 100755 index 0000000..8fef48c --- /dev/null +++ b/helpers/jjCliYargs.ts @@ -0,0 +1,77 @@ +#!/usr/bin/env bun + +import yargs from "yargs"; +import { hideBin } from "yargs/helpers"; +import fs from "fs-extra"; + +try { + const rawConfigData = fs.readFileSync(`${process.env.JJ_SOURCE_DIR}/~~tmp/jjConfigs.json`, 'utf8'); + const parsedConfig = JSON.parse(rawConfigData); + const availableEnvironments = parsedConfig?.jjYamlObj?.environments || {}; + + const cliArgs = yargs(hideBin(process.argv)).help(false).argv; + const argumentsObj = { ...cliArgs }; + + const doubleDashIndex = process.argv.findIndex((arg) => arg === "--"); + const remainingArgs = doubleDashIndex === -1 ? [] : process.argv.filter((_, index) => index > doubleDashIndex); + const mainCommands = (argumentsObj?._ || []).filter((cmd) => !remainingArgs.includes(cmd.toString())); + + let commandString = ""; + const commandList = []; + mainCommands.forEach((command, index) => { + console.log(`export JJ_CLI_ARG_${index + 1}="${command}"`); + commandString += `"${command}" `; + commandList.push(command); + }); + + console.log(`export JJ_CLI_COMMANDS="${commandString}"`); + console.log(`export JJ_CLI_COMMANDS_COMMA_SEPTATE="${commandList.join(",")}"`); + console.log(`export JJ_CLI_ADDITIONAL_ARGS="${remainingArgs.reduce((str, arg) => (str += `${arg} `), "").trim()}"`); + console.log(`export JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE="${remainingArgs.join(",")}"`); + + delete argumentsObj._; + delete argumentsObj["$0"]; + + if (!argumentsObj["env"]) { + argumentsObj["env"] = "development"; + } + + const allOptionsMap = {}; + Object.keys(argumentsObj).forEach((key) => { + argumentsObj[`${key}_alias`] = argumentsObj[key]; + if (key === "env") { + const selectedEnv = argumentsObj["env"]; + + const envKeys = []; + const envAliases = []; + Object.keys(availableEnvironments).forEach((envKey) => { + const envConfig = availableEnvironments[envKey]; + envKeys.push(`${envKey}`); + envAliases.push(`${envConfig?.alias}`); + }); + + const keyIndex = envKeys.findIndex((item) => item === selectedEnv); + const aliasIndex = envAliases.findIndex((item) => item === selectedEnv); + + if (keyIndex < 0 && aliasIndex < 0) { + return; + } + + if (keyIndex < 0) { + argumentsObj["env"] = envKeys[aliasIndex]; + } + + const matchedEnvIndex = keyIndex > -1 ? keyIndex : aliasIndex; + argumentsObj[`${key}_alias`] = envAliases[matchedEnvIndex]; + } + console.log(`export JJ_CLI_OPTION_${key.toUpperCase().split("-").join("_")}="${argumentsObj[key]}"`); + console.log(`export JJ_CLI_OPTION_${key.toUpperCase().split("-").join("_")}_ALIAS="${argumentsObj[`${key}_alias`]}"`); + allOptionsMap[`${key.toUpperCase().split("-").join("_")}`] = argumentsObj[key]; + allOptionsMap[`${key.toUpperCase().split("-").join("_")}_ALIAS`] = argumentsObj[`${key}_alias`]; + }); + console.log(`export JJ_CLI_OPTIONS="${JSON.stringify(allOptionsMap)}"`); + +} catch (exception) { + console.error(exception); + process.exit(1); +} diff --git a/jj.sh b/jj.sh index 019268c..10916f1 100755 --- a/jj.sh +++ b/jj.sh @@ -1,10 +1,11 @@ #!/usr/bin/env zsh -source ~/.bashrc -set - + +set -e trap '[[ "$?" == "1" ]] && echo -e "\033[1;31m[jj] ERROR !\033[0m" >&2' EXIT +# set + autoload -U compinit @@ -76,9 +77,28 @@ eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs) source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh" -echo $JJ_GIT_USER_KEY_NAME +# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ +eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ ) +set -- $(echo $JJ_CLI_COMMANDS) + +echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE + + +export JJ_WORKSPACE_CURRENT_COMMIT=$(cd $JJ_WORKSPACE_DIR ; git rev-parse HEAD) +export JJ_WORKSPACE_CURRENT_BRANCH=$(cd $JJ_WORKSPACE_DIR ; git rev-parse --abbrev-ref HEAD) +export JJ_WORKSPACE_CURRENT_COMMIT_AUTHOR=$(cd $JJ_WORKSPACE_DIR ; git show -s --format='%an %ae' $JJ_WORKSPACE_CURRENT_COMMIT ) +export JJ_WORKSPACE_CURRENT_VERSION=$(cat $JJ_WORKSPACE_DIR/package.json | jq -r '.version') +export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") + + +if [[ -z "$JJ_CLI_OPTION_COMMIT" ]]; then + export JJ_CLI_SELECTED_COMMIT=$JJ_WORKSPACE_CURRENT_COMMIT +else + export JJ_CLI_SELECTED_COMMIT=$JJ_CLI_OPTION_COMMIT +fi + # if [[ ! -e $JJ_SOURCE_DIR/~~tmp/pa ]]; then # echo "asdadasd" diff --git a/package.json b/package.json index 8c1adc9..aad00af 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.7", "author": "Jason Jafari", "bin": { - "jj": "./jj.sh" + "jj": "./jj.sh $@" }, "bugs": "https://github.com/https://github.com/jafarijason/jj/jj/issues", "dependencies": { @@ -28,7 +28,8 @@ "pino": "^9.5.0", "pino-pretty": "^12.1.0", "shelljs": "^0.8.5", - "winston": "^3.16.0" + "winston": "^3.16.0", + "yargs": "^17.7.2" }, "devDependencies": { "@oclif/prettier-config": "^0.2.1",