Merge branch 'release/5.40.0'

Author: tomgrv

.vscode/settings.json

@@ -1,20 +1,15 @@
 {
-    "doppler": {
-        "autocomplete": {
-            "enable": null
-        },
-        "hover": {
-            "enable": null
-        }
-    },
+    "$schema": "https://raw.githubusercontent.com/wraith13/vscode-schemas/refs/heads/master/en/latest/schemas/settings/user.json",
+    "doppler.autocomplete.enable": true,
+    "doppler.hover.enable": true,
     "workbench.colorCustomizations": {
+        "activityBar.background": "#9DC08B",
+        "activityBar.foreground": "#374633",
+        "activityBar.inactiveForeground": "#2c3829",
         "titleBar.activeBackground": "#9DC08B",
-        "titleBar.border": "#9DC08B",
         "titleBar.activeForeground": "#374633",
+        "titleBar.border": "#9DC08B",
         "titleBar.inactiveBackground": "#acc99c",
-        "titleBar.inactiveForeground": "#556252",
-        "activityBar.background": "#9DC08B",
-        "activityBar.foreground": "#374633",
-        "activityBar.inactiveForeground": "#2c3829"
+        "titleBar.inactiveForeground": "#556252"
     }
-}
+}

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 # Changelog
 
+## 5.40.0 (2026-03-27)
+
+_Commits from: v5.39.2..HEAD_
+
+### 📂 Unscoped changes
+
+#### Other changes
+
+- Merge tag 'v5.39.0' into develop ([d3c7956](https://github.com/tomgrv/devcontainer-features/commit/d3c79568c025f8a75000b5d058c1375c34d6b8c6))
+- Merge tag 'v5.39.1' into develop ([5cc9646](https://github.com/tomgrv/devcontainer-features/commit/5cc96466899a2829f6d13fc6df4f2e3c7ce21ea3))
+- Merge tag 'v5.39.2' into develop ([083e77e](https://github.com/tomgrv/devcontainer-features/commit/083e77e6a128778b7e79ea592d9ecc6e48900032))
+- ♻️ simplify doppler settings structure ([53e7a8e](https://github.com/tomgrv/devcontainer-features/commit/53e7a8e1eb07024c4f1828feff5f7087fd7bd45c))
+
+### 📦 common-utils changes
+
+#### Bug Fixes
+
+- 🐛 enhance argument parsing for dispatch and args scripts ([fcda5a3](https://github.com/tomgrv/devcontainer-features/commit/fcda5a322eb85f9aafd020b9ea770f64598a4b51))
+- 🐛 improve error handling for missing source in json loader ([da4adde](https://github.com/tomgrv/devcontainer-features/commit/da4adde8478ea014d3c38844c9fd8fa8ccf34481))
+- 🐛 improve parameter handling in dispatch script ([8ae8fa5](https://github.com/tomgrv/devcontainer-features/commit/8ae8fa5ddfa89730ee28987be289ffaad5203794))
+- 🐛 improve schema loading and error handling in JSON validation ([5259f49](https://github.com/tomgrv/devcontainer-features/commit/5259f49a7b65fb89c17534892655629c79ed410c))
+- 🐛 remove unused preserve function call in dispatch script ([e91d5c3](https://github.com/tomgrv/devcontainer-features/commit/e91d5c3a5a42623968b6f8411ca54fcd7eb5ce90))
+
 ## 5.39.2 (2026-03-25)
 
 _Commits from: v5.39.1..HEAD_
@@ -661,4 +684,4 @@ _Commits from: v5.25.0..HEAD_
 
 ---
 
-_Generated on 2026-03-25 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
+_Generated on 2026-03-27 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/devcontainer-features",
-    "version": "5.39.2",
+    "version": "5.40.0",
     "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
     "keywords": [
         "dev",

package.json

@@ -31,7 +31,7 @@ for file in $files; do
 
     # Validate JSON
     zz_log i "Normalizing {U $file}..."
-    list=$(validate-json ${allow:+-a} ${cache:+-c} ${debug:+-d} ${fallback:+-f "$fallback"} ${local:+-l "$local"} ${import:+-i} ${schema:+-s"$schema"} $file)
+    list=$(./src/common-utils/_validate-json.sh ${allow:+-a} ${cache:+-c} ${debug:+-d} ${fallback:+-f "$fallback"} ${local:+-l "$local"} ${import:+-i} ${schema:+-s"$schema"} $file)
 
     if test -z "$list"; then
         zz_log e "JSON {U $file} not valid, cannot normalize" && exit 1
@@ -54,7 +54,7 @@ for file in $files; do
             $lst | split("\n") 
                 | map(select(length > 0))
                 | map(
-                   split(".") | map(fromjson? // .)
+                   split("\".\"") | map(ltrimstr("\"") | rtrimstr("\""))
                 );
         def xpath($ary):
             . as $in

src/common-utils/_normalize-json.sh

@@ -455,6 +455,16 @@ validate() {
     zz_log "${lvl}" "{Blue End Parsing, all valid!}" >&2
 }
 
+# if no schema loaded, open file and check if it contains a $schema property with a valid url, and load it if found
+if [ -z "$schema" ]; then   
+
+    schema=$(zz_json $json | jq -r '."$schema" // empty')
+
+    if test -n "$schema"; then
+        zz_log i "Found schema reference in JSON file: {U $schema}"
+    fi
+fi
+
 # if local flag is set, get schema from json file name
 if [ -n "$local" ] && [ -z "$schema" ]; then
 
@@ -501,12 +511,17 @@ if [ -n "$fallback" ] && [ -z "$schema" ]; then
     zz_log w "Using fallback schema {UYellow $schema}"
 fi
 
+# Check if schema is readable
+if test -z "$schema"; then
+    zz_log e "Schema is missing" && exit 1
+fi
+
 # Download schema file and add id to it if not present
 schema=$(zz_json -s "$schema")
 
 # Check if schema is readable
 if test -z "$schema"; then
-    zz_log e "Schema is missing" && exit 1
+    zz_log e "Schema is empty" && exit 1
 fi
 
 # if schema is not a valid JSON, return error

src/common-utils/_validate-json.sh

@@ -26,7 +26,8 @@ if test $# -lt 1; then
     x   for flags x with value (e.g., -f value, -h being reserved for help)
     -   for sequential arguments in the order defined, without flags
     +   to capture all remaining arguments as a single variable with spaces as separators
-    &   to capture all remaining arguments as a single variable with newlines as separators" >&2
+    &   to capture all remaining arguments as a multiple-line variable
+    #   to capture all remaining arguments with escaped spaces" >&2
     return 1
 fi
 
@@ -56,6 +57,9 @@ while read argname datatype varname help; do
     elif [ "$argname" = "&" ]; then
         line="<$datatype...>>"
         helpinfo="$helpinfo\n\t$(printf '%-12s : %s' "$name" "$help")"
+    elif [ "$argname" = "#" ]; then
+        line="<$datatype...>>"
+        helpinfo="$helpinfo\n\t$(printf '%-12s : %s' "$name" "$help")"
     else
         if [ "$datatype" = "-" ]; then
             line="[-$argname]"
@@ -132,6 +136,21 @@ else
         echo "$arg='$lines'"  
     done
 
+    # Process remaining '#' parameters
+    for arg in $(echo $varnames | grep -E "^#" | cut -f2); do
+        lines=""
+        while [ "$#" -gt "0" ]; do
+            # spaces that are not escaped should be preserved as part of the argument
+            if [ -z "$lines" ]; then
+                lines="$(printf '%s' "$1" | sed 's/ /\\ /g')"
+            else
+                lines="$lines $(printf '%s' "$1" | sed 's/ /\\ /g')"
+            fi
+            shift 1
+        done
+        echo "$arg='$lines'"  
+    done
+
     # Process remaining '+' parameters
     for arg in $(echo $varnames | grep -E "^\+" | cut -f2); do
         if [ "$#" -gt "0" ]; then

src/common-utils/_zz_args.sh

@@ -8,11 +8,11 @@ set -e
 
 # Parse arguments and display help if needed
 eval $(
-    zz_args "Dispatch Utility" $0 "$@" <<- help
+     ./src/common-utils/_zz_args.sh "Dispatch Utility" $0 "$@" <<- help
 		-   caller caller     Caller script path
         -   subcmd subcmd     Target script to execute
         d   debug  debug      Enable debug mode
-        &   params params     Remaining arguments passed to the target script
+        #   params params     Remaining arguments passed to the target script
 	help
 )
 
@@ -51,14 +51,13 @@ else
     target="${caller_dir}/${name}"
 fi
 
-echo $(preserve $params)
-
+# Check if target exists and is executable, then dispatch
 if [ -x "${target}" ]; then
     zz_log i "Dispatching to executable target: ${target}" >&2
-    exec "${target}" $(echo $@)
+    eval exec "${target}" $params 
 elif [ -f "${target}" ]; then
     zz_log i "Dispatching to subshell target: ${target}" >&2
-    exec sh "${target}" $(echo $@)
+    eval exec sh "${target}" $params 
 else
     # Nothing found: show help and available utilities in the same directory
     zz_log w "No dispatch target found" && usage

src/common-utils/_zz_dispatch.sh

@@ -22,6 +22,8 @@ if test -n "$(echo $source | grep -E '^http')"; then
 elif test -f "$source"; then
     zz_log i "Loading file {U $source}"
     cat $source
-else
+elif test -n "$source"; then
     zz_log e "File {U $source} not found" && exit 1
+else
+    zz_log e "No source provided" && exit 1
 fi | sed -e 's:^[[:blank:]]*//.*$::g' 2>/dev/null | jq --arg source "$source" --arg schema "${schema:+true}" 'if . == null then {} else . end | if ($source != "" and has("$id")) or $schema == "" then . else . + {"$id": $source} end'

src/common-utils/_zz_json.sh

@@ -2,7 +2,7 @@
     "id": "common-utils",
     "name": "Common Utils",
     "description": "Common utils for tomgrv/devcontainer-features",
-    "version": "5.39.2",
+    "version": "5.40.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils": {}
     },