Merge branch 'main' into release/server/1.2.0

Author: johngrimes

.claude/commands/update-version.md

@@ -0,0 +1,17 @@
+Update the Pathling core version across all required files and commit the
+change. The new version is: $ARGUMENTS
+
+Read the "Updating the version" section of `RELEASE_CHECKLIST.md` to determine
+which files to update. Read the root `pom.xml` to determine the current
+version.
+
+If the new version ends with `-SNAPSHOT`, update only the POM files. If it is a
+release version (no `-SNAPSHOT` suffix), also update the release-only files. For
+release-only files, replace the previous release version (the version currently
+in those files) with the new version.
+
+After making all changes, stage the modified files and commit with the message:
+
+```
+chore: Update core version to <version>
+```

.githooks/pre-commit

@@ -21,6 +21,37 @@ command_exists() {
     command -v "$1" >/dev/null 2>&1
 }
 
+# Find a project-local Node binary by walking up from a file's directory.
+# Falls back to the global binary if no local installation is found.
+find_node_bin() {
+    local file="$1"
+    local bin_name="$2"
+    local dir
+
+    dir=$(dirname "$file")
+    while [ "$dir" != "." ] && [ "$dir" != "/" ]; do
+        if [ -x "$dir/node_modules/.bin/$bin_name" ]; then
+            echo "$dir/node_modules/.bin/$bin_name"
+            return 0
+        fi
+        dir=$(dirname "$dir")
+    done
+
+    # Check the repo root.
+    if [ -x "node_modules/.bin/$bin_name" ]; then
+        echo "node_modules/.bin/$bin_name"
+        return 0
+    fi
+
+    # Fall back to the global binary.
+    if command_exists "$bin_name"; then
+        echo "$bin_name"
+        return 0
+    fi
+
+    return 1
+}
+
 # Format a file and re-stage it if modified.
 format_and_restage() {
     local file="$1"
@@ -55,22 +86,22 @@ for FILE in $STAGED_FILES; do
 
     case "$EXT" in
         js|jsx|ts|tsx|json|md|markdown)
-            if ! command_exists prettier; then
+            PRETTIER=$(find_node_bin "$FILE" "prettier") || {
                 echo "Error: prettier is not installed. Please install it with: bun add -g prettier"
                 exit 1
-            fi
-            format_and_restage "$FILE" prettier --write "$FILE"
+            }
+            format_and_restage "$FILE" "$PRETTIER" --write "$FILE"
             ;;
         yaml|yml)
             # Skip Helm templates (contain Go template syntax that Prettier cannot parse).
             if [[ "$FILE" == */templates/*.yaml || "$FILE" == */templates/*.yml ]]; then
                 continue
             fi
-            if ! command_exists prettier; then
+            PRETTIER=$(find_node_bin "$FILE" "prettier") || {
                 echo "Error: prettier is not installed. Please install it with: bun add -g prettier"
                 exit 1
-            fi
-            format_and_restage "$FILE" prettier --write "$FILE"
+            }
+            format_and_restage "$FILE" "$PRETTIER" --write "$FILE"
             ;;
         java)
             if ! command_exists google-java-format; then

encoders/pom.xml

@@ -31,7 +31,7 @@
   <parent>
     <groupId>au.csiro.pathling</groupId>
     <artifactId>pathling</artifactId>
-    <version>9.4.0</version>
+    <version>9.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>encoders</artifactId>
   <packaging>jar</packaging>

fhirpath/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>au.csiro.pathling</groupId>
     <artifactId>pathling</artifactId>
-    <version>9.4.0</version>
+    <version>9.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>fhirpath</artifactId>
   <packaging>jar</packaging>

lib/R/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>au.csiro.pathling</groupId>
     <artifactId>pathling</artifactId>
-    <version>9.4.0</version>
+    <version>9.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>r</artifactId>

lib/python/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>au.csiro.pathling</groupId>
     <artifactId>pathling</artifactId>
-    <version>9.4.0</version>
+    <version>9.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>python</artifactId>

library-api/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <artifactId>pathling</artifactId>
     <groupId>au.csiro.pathling</groupId>
-    <version>9.4.0</version>
+    <version>9.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>library-api</artifactId>
   <packaging>jar</packaging>

library-runtime/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <artifactId>pathling</artifactId>
     <groupId>au.csiro.pathling</groupId>
-    <version>9.4.0</version>
+    <version>9.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>library-runtime</artifactId>
   <packaging>jar</packaging>

pom.xml

@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>au.csiro.pathling</groupId>
   <artifactId>pathling</artifactId>
-  <version>9.4.0</version>
+  <version>9.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Pathling</name>