From 7bd11ad19b430742e6c2f19e4826c9be2071ef1f Mon Sep 17 00:00:00 2001 From: Jason Jafari Date: Fri, 22 Nov 2024 20:13:44 -0500 Subject: [PATCH] WIP --- helpers/jjCliYargs.ts | 12 +++++++++--- jj.sh | 29 +++++++++++++---------------- package.json | 2 +- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/helpers/jjCliYargs.ts b/helpers/jjCliYargs.ts index f41af3f..5d13535 100755 --- a/helpers/jjCliYargs.ts +++ b/helpers/jjCliYargs.ts @@ -3,7 +3,8 @@ import yargs from "yargs"; import { hideBin } from "yargs/helpers"; import fs from "fs-extra"; -import { jjConfigsExp } from "./jjConfigUtils"; +import { getJJConfigByKeyChain, jjConfigsExp } from "./jjConfigUtils"; +import { dynamicStringHandler } from '@jjHelpers/dynamicStringHandler'; @@ -77,13 +78,18 @@ export const jjCliYargs = (cli = true) => { }); envsObj[`JJ_CLI_OPTIONS`] = JSON.stringify(allOptionsMap) - if(!envsObj['JJ_CLI_OPTION_COMMIT']){ + if (!envsObj['JJ_CLI_OPTION_COMMIT']) { envsObj['JJ_CLI_SELECTED_COMMIT'] = process.env['JJ_WORKSPACE_CURRENT_COMMIT'] } else { envsObj['JJ_CLI_SELECTED_COMMIT'] = envsObj['JJ_CLI_OPTION_COMMIT'] } + const jjCommandConfig = getJJConfigByKeyChain(`commands['${envsObj['JJ_CLI_ARG_1']}']`) + envsObj['JJ_CLI_SCRIPT_TO_RUN_PRE_PATH'] = dynamicStringHandler(`${jjCommandConfig.scriptToRun.prePath}`, "", process.env, false) + envsObj['JJ_CLI_SCRIPT_TO_RUN_PATH'] = dynamicStringHandler(`${jjCommandConfig.scriptToRun.path}`, "", process.env, false) + envsObj['JJ_CLI_SCRIPT_TO_RUN_TYPE'] = jjCommandConfig.scriptToRun?.type || 'bun' + if (cli) { Object.keys(envsObj).forEach(envKey => { console.log(`export ${envKey}="${envsObj[envKey]}"`) @@ -102,7 +108,7 @@ export const jjCliYargs = (cli = true) => { } } -if(process.argv[process.argv.length - 1]== "cli"){ +if (process.argv[process.argv.length - 1] == "cli") { process.argv.pop() jjCliYargs() } \ No newline at end of file diff --git a/jj.sh b/jj.sh index 048e59a..49cc340 100755 --- a/jj.sh +++ b/jj.sh @@ -92,12 +92,12 @@ fi if [[ ! -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]] \ - || [[ -z $JJ_WORKSPACE_DIR ]] \ - || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/jj.yaml" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ - || jjIsFileNewerFile "$JJ_DATA_DIR/~~tmp/jjConfigs.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ - || jjIsFileNewerFile "$JJ_SOURCE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ - || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ - ; then +|| [[ -z $JJ_WORKSPACE_DIR ]] \ +|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/jj.yaml" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ +|| jjIsFileNewerFile "$JJ_DATA_DIR/~~tmp/jjConfigs.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ +|| jjIsFileNewerFile "$JJ_SOURCE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ +|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \ +; then MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 01 $MILLISECONDS" eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs) MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 02 $MILLISECONDS" @@ -113,7 +113,6 @@ export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") if [[ -e $JJ_WORKSPACE_DIR ]]; then - # pushd "${JJ_GIT_METADATA_DIR}/" > /dev/null # git pull origin > /dev/null & # popd > /dev/null @@ -131,19 +130,17 @@ source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh" # echo 2 # # exit 0 # ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ -# eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli) -# set -- $(echo $JJ_CLI_COMMANDS) +eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli) +set -- $(echo $JJ_CLI_COMMANDS) # echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE - - - - -# if [[ ! -e $JJ_DATA_DIR/~~tmp/pa ]]; then -# echo "asdadasd" -# fi +if [[ "$JJ_CLI_SCRIPT_TO_RUN_TYPE" == "bash" ]]; then + cd $JJ_CLI_SCRIPT_TO_RUN_PRE_PATH + ./${JJ_CLI_SCRIPT_TO_RUN_PATH} + exit 0 +fi ${JJ_SOURCE_DIR}/helpers/jjCli.ts $@ diff --git a/package.json b/package.json index b44101e..9a9f77d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jj-command-line", "description": "jj cli", - "version": "1.0.15", + "version": "1.0.16", "author": "Jason Jafari", "bin": { "jj": "./jj.sh"