Fix just argument splitting on pass-through recipes with complex args

.vale/justfile

@@ -14,7 +14,7 @@ IGNORE_FILES_PATTERN := ".pnpm|changelogs|projects/proposals|node_modules|.?venv
 # of the current working directory. If a custom separator is specified, newlines are
 # replaced with this separator before outputting the file list.
 _files separator="\n":
-    #! /usr/bin/env sh
+    #! /usr/bin/env bash
     files=$(
         find "$PWD/.." -type f \( -name "*.md" -o -name "*.mdx" \) \
             | grep -vE "{{ IGNORE_FILES_PATTERN }}"

api/justfile

@@ -45,12 +45,14 @@ install *args:
 ######
 
 # Bring up services specific to the API profile
+[positional-arguments]
 up *flags:
-    env COMPOSE_PROFILES="api" just ../up {{ flags }}
+    env COMPOSE_PROFILES="api" just ../up "$@"
 
 # Bring up services specific to the API profile, in addition to the API server
+[positional-arguments]
 up-extra *flags:
-    env COMPOSE_PROFILES="api,api_extra" just ../up {{ flags }}
+    env COMPOSE_PROFILES="api,api_extra" just ../up "$@"
 
 # Wait for all profile services to be up
 wait-up: up
@@ -103,12 +105,14 @@ pgcli db_user_pass="deploy" db_name="openledger": up
 #########################
 
 # Run Django administrative commands locally
-dj-local +args="":
-    pdm run python manage.py {{ args }}
+[positional-arguments]
+dj-local *args:
+    pdm run python manage.py "$@"
 
 # Run Django administrative commands inside the Docker container
-dj +args="": wait-up
-    env DC_USER="{{ env_var_or_default("DC_USER", "opener") }}" just ../exec web python manage.py {{ args }}
+[positional-arguments]
+dj *args: wait-up
+    env DC_USER="{{ env_var_or_default("DC_USER", "opener") }}" just ../exec web python manage.py "$@"
 
 # Get IPython shell inside the Docker container
 ipython:
@@ -152,12 +156,14 @@ generate-docs doc="media-props" fail_on_diff="true":
 #########
 
 # Run API tests inside the Docker container
+[positional-arguments]
 test *args: wait-up
-    env DC_USER="opener" just ../exec web pytest {{ args }}
+    env DC_USER="opener" just ../exec web pytest "$@"
 
 # Run API tests locally
+[positional-arguments]
 test-local *args:
-    pdm run pytest {{ args }}
+    pdm run pytest "$@"
 
 # Run smoke test for the API docs
 doc-test: wait-up

automations/js/justfile

@@ -10,8 +10,9 @@ NO_COLOR := "\\033[0m"
     just --list --unsorted
 
 # Run a script
+[positional-arguments]
 run script *args:
-    pnpm --filter automations exec node src/{{ script }} {{ args }}
+    pnpm --filter automations exec node src/{{ script }} "${@:2}"
 
 #################
 # Weekly report #
@@ -26,14 +27,15 @@ report:
 ##########
 
 render-release-drafter:
-    #! /usr/bin/env sh
+    #! /usr/bin/env bash
     render_release_drafter() {
         slug=$1
         name=$2
+        confjson=$(printf '{"app": "%s"}' "$name")
         just run render-jinja.js \
             templates/release-drafter.yml.jinja \
-            .github/release-drafter-$slug.yml \
-            "'{ \"app\": \"$name\" }'"
+            .github/release-drafter-"$slug".yml \
+            "$confjson"
     }
     render_release_drafter api API
     render_release_drafter ingestion_server "Ingestion Server"

automations/python/justfile

@@ -11,9 +11,11 @@ NO_COLOR := "\\033[0m"
 
 
 # Install dependencies
+[positional-arguments]
 install *args:
-    pdm install {{ args }}
+    pdm install "$@"
 
 # Run a script
+[positional-arguments]
 run script *args:
-    pdm run {{ script }} {{ args }}
+    pdm run "$@"

catalog/justfile

@@ -56,12 +56,14 @@ install *args: check-py-version
 ######
 
 # Bring up services specific to the catalog profile
+[positional-arguments]
 up *flags:
-    env COMPOSE_PROFILES="catalog" just ../up {{ flags }}
+    env COMPOSE_PROFILES="catalog" just ../up "$@"
 
 # Bring up services specific to the catalog profile, except Airflow
+[positional-arguments]
 up-deps *flags:
-    env COMPOSE_PROFILES="catalog_dependencies" just ../up {{ flags }}
+    env COMPOSE_PROFILES="catalog_dependencies" just ../up "$@"
 
 # Load sample data into upstream DB
 init: up
@@ -111,8 +113,9 @@ test-session:
     just _mount-test bash
 
 # Run pytest in a test container under `SERVICE`
+[positional-arguments]
 test *args:
-    just _mount-test "bash -c \'pytest {{ args }}\'"
+    just _mount-test "bash -c \'pytest ""$@""\'"
 
 #############
 # Utilities #

docker/cache/justfile

@@ -14,8 +14,9 @@ NO_COLOR := "\\033[0m"
 #######
 
 # Open the Redis CLI as an interactive REPL
+[positional-arguments]
 cli *args:
-    just ../../exec cache redis-cli {{ args }}
+    just ../../exec cache redis-cli "$@"
 
 # Delete all data cached in Redis
 flushall:

documentation/justfile

@@ -72,8 +72,9 @@ live port="50230": clean
     pdm run sphinx-autobuild -b html . _serve/ --port {{ port }}
 
 # Compile the documentation into a static site
+[positional-arguments]
 build *args: clean
-    pdm run sphinx-build {{ args }} -b html . _build/
+    pdm run sphinx-build "$@" -b html . _build/
 
 # Serve the compiled docs using a simple HTTP server
 serve port="50231":

frontend/bin/playwright.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/env sh
+#! /usr/bin/env bash
 set -e
 
 version() {

frontend/justfile

@@ -55,8 +55,9 @@ run-img tag="openverse-frontend:local":
 ######
 
 # Bring up services specific to the frontend profile
+[positional-arguments]
 up *flags:
-    env COMPOSE_PROFILES="frontend" just ../up {{ flags }}
+    env COMPOSE_PROFILES="frontend" just ../up "$@"
 
 # Wait for all profile services to be up
 wait-up: up
@@ -67,8 +68,9 @@ init: wait-up
     cd .. && ./setup_plausible.sh
 
 # Run a package.json script via pnpm
+[positional-arguments]
 run *args:
-    pnpm run {{ args }}
+    pnpm run "$@"
 
 # Generate the specified kind of documentation
 generate-docs doc="media-props" fail_on_diff="true":

indexer_worker/justfile

@@ -33,8 +33,9 @@ install *args="--dev":
 ######
 
 # Bring up services specific to the indexer worker profile
+[positional-arguments]
 up *flags:
-    env COMPOSE_PROFILES="catalog_indexer_worker" just ../up {{ flags }}
+    env COMPOSE_PROFILES="catalog_indexer_worker" just ../up "$@"
 
 wait-up: up
     just wait
@@ -77,9 +78,12 @@ curl-post data host="localhost:50281":
 # Tests #
 #########
 
+# Run indexer worker tests in the container
+[positional-arguments]
 test *args: wait-up
-    just ../exec catalog_indexer_worker pytest {{ args }}
+    just ../exec catalog_indexer_worker pytest "$@"
 
 # Run indexer-worker tests locally
+[positional-arguments]
 test-local *args:
-    pdm run pytest {{ args }}
+    pdm run pytest "$@"

justfile

@@ -4,9 +4,6 @@ set dotenv-load := false
 # @ - Quiet recipes (https://github.com/casey/just#quiet-recipes)
 # _ - Private recipes (https://github.com/casey/just#private-recipes)
 
-IS_PROD := env_var_or_default("PROD", env_var_or_default("IS_PROD", ""))
-# `PROD_ENV` can be "ingestion_server" or "catalog"
-PROD_ENV := env_var_or_default("PROD_ENV", "")
 IS_CI := env_var_or_default("CI", "")
 DC_USER := env_var_or_default("DC_USER", "opener")
 
@@ -137,8 +134,9 @@ precommit:
     fi
 
 # Run pre-commit to lint and reformat files
+[positional-arguments]
 lint hook="" *files="": precommit
-    python3 pre-commit.pyz run {{ hook }} {{ if files == "" { "--all-files" } else { "--files" } }}  {{ files }}
+    python3 pre-commit.pyz run {{ hook }} {{ if files == "" { "--all-files" } else { "--files {{ files }}" } }}
 
 # Run codeowners validator locally. Only enable experimental hooks if there are no uncommitted changes.
 lint-codeowners checks="stable":
@@ -171,14 +169,7 @@ lint-codeowners checks="stable":
 # Docker #
 ##########
 
-DOCKER_FILE := "-f " + (
-    if IS_PROD == "true" {
-        if PROD_ENV == "ingestion_server" { "ingestion_server/docker-compose.yml" }
-        else if PROD_ENV == "catalog" { "catalog/docker-compose.yml" }
-        else { "docker-compose.yml" }
-    }
-    else { "docker-compose.yml" }
-)
+DOCKER_FILE := "-f docker-compose.yml"
 EXEC_DEFAULTS := if IS_CI == "" { "" } else { "-T" }
 
 export CATALOG_PY_VERSION := `just catalog/py-version`
@@ -207,13 +198,15 @@ versions:
     EOF
 
 # Run `docker compose` configured with the correct files and environment
+[positional-arguments]
 dc *args:
     @{{ if IS_CI != "" { "just env" } else { "true" } }}
-    env COMPOSE_PROFILES="{{ env_var_or_default("COMPOSE_PROFILES", "api,ingestion_server,frontend,catalog") }}" docker compose {{ DOCKER_FILE }} {{ args }}
+    env COMPOSE_PROFILES="{{ env_var_or_default("COMPOSE_PROFILES", "api,ingestion_server,frontend,catalog") }}" docker compose {{ DOCKER_FILE }} "$@"
 
 # Build all (or specified) services
+[positional-arguments]
 build *args:
-    just dc build {{ args }}
+    just dc build "$@"
 
 # List all services and their URLs and ports
 @ps:
@@ -223,11 +216,12 @@ build *args:
 
 # Also see `up` recipe in sub-justfiles
 # Bring all Docker services up, in all profiles
+[positional-arguments]
 up *flags: env && ps
     #!/usr/bin/env bash
     set -eo pipefail
     while true; do
-      if just dc up {{ if IS_CI != "" { "--quiet-pull" } else { "" } }} -d {{ flags }} ; then
+      if just dc up {{ if IS_CI != "" { "--quiet-pull" } else { "" } }} -d "$@" ; then
         break
       fi
       ((c++)) && ((c==3)) && break
@@ -249,8 +243,9 @@ init:
     just frontend/init
 
 # Take all Docker services down, in all profiles
+[positional-arguments]
 down *flags:
-    just dc down {{ flags }}
+    just dc down "$@"
 
 # Take all services down then call the specified app's up recipe. ex.: `just dup catalog` is useful for restarting the catalog with new environment variables
 dup app:
@@ -277,12 +272,14 @@ attach service:
     docker attach $(just dc ps | awk '{print $1}' | grep {{ service }})
 
 # Execute statement in service containers using Docker Compose
+[positional-arguments]
 exec +args:
-    just dc exec -u {{ env_var_or_default("DC_USER", "root") }} {{ EXEC_DEFAULTS }} {{ args }}
+    just dc exec -u {{ env_var_or_default("DC_USER", "root") }} {{ EXEC_DEFAULTS }} "$@"
 
 # Execute statement in a new service container using Docker Compose
+[positional-arguments]
 run +args:
-    just dc run --rm -u {{ env_var_or_default("DC_USER", "root") }} {{ EXEC_DEFAULTS }} "{{ args }}"
+    just dc run --rm -u {{ env_var_or_default("DC_USER", "root") }} {{ EXEC_DEFAULTS }} "$@"
 
 # Execute pgcli against one of the database instances
 _pgcli container db_user_pass db_name db_host db_port="5432":
@@ -352,20 +349,31 @@ f:
     just frontend/run dev
 
 # alias for `pnpm --filter {package} run {script}`
-p package script +args="":
-    pnpm --filter {{ package }} run {{ script }} {{ args }}
+[positional-arguments]
+p package script *args:
+    pnpm --filter {{ package }} run {{ script }} "${@:3}"
 
 # Run eslint with --fix and default file selection enabled; used to enable easy file overriding whilst retaining the defaults when running --all-files
-eslint *files="frontend automations/js packages/js .pnpmfile.cjs .eslintrc.js prettier.config.js tsconfig.base.json":
+[positional-arguments]
+eslint *args:
+    #! /usr/bin/env bash
     just p '@openverse/eslint-plugin' build
+    if [[ "$@" ]]; then
+        files=("$@")
+    else
+        # default files
+        files=(frontend automations/js packages/js .pnpmfile.cjs .eslintrc.js prettier.config.js tsconfig.base.json)
+    fi
+
     pnpm exec eslint \
         --ext .js,.ts,.vue,.json,.json5 \
         --ignore-path .gitignore \
         --ignore-path .eslintignore \
         --max-warnings=0 \
         --fix \
-        {{ files }}
+        "${files[@]}"
 
 # Alias for `just packages/js/k6/run` or `just p k6 run`
+[positional-arguments]
 @k6 *args:
-    just packages/js/k6/run {{ args }}
+    just packages/js/k6/run "$@"

packages/js/k6/justfile

@@ -1,4 +1,5 @@
 # Build and run K6 script by namespace and scenario
-run namespace scenario +extra_args="":
+[positional-arguments]
+run namespace scenario *extra_args:
     pnpm run build --input src/{{ namespace }}/{{ scenario }}.test.ts
-    k6 run {{ extra_args }} ./dist/{{ namespace }}/{{ scenario }}.test.js
+    k6 run "${@:3}" ./dist/{{ namespace }}/{{ scenario }}.test.js

packages/python/openverse-attribution/justfile

@@ -14,5 +14,6 @@ NO_COLOR := "\\033[0m"
 ###########
 
 # Install dependencies
+[positional-arguments]
 install *args:
-    pdm install {{ args }}
+    pdm install "$@"