Refactor execution handler validation and version bump (#512)

* Refactor execution handler validation to improve clarity and ensure all handlers are validated consistently

* Rev version

Author: jessehouwing

app/lib/jsonvalidate.ts

@@ -101,7 +101,7 @@ export function validateRunner(taskData: any, allMatchedPaths?: string[]) {
         }
       }
     }
-    
+
     trace.warn("Task %s@%s is dependent on a task runner that is end-of-life and will be removed in the future. Please visit https://aka.ms/node-runner-guidance to learn how to upgrade the task.", taskData.name, taskData.version?.Major || "?")
   }
 }
@@ -132,32 +132,62 @@ export function validateTask(taskPath: string, taskData: any): string[] {
     issues.push(vn + ": instanceNameFormat is required");
   }
 
-  if (taskData.execution) {
-    const supportedRunners = ["Node", "Node10", "Node16", "Node20_1", "PowerShell", "PowerShell3", "Process"]
-
-    for (var runner in taskData.execution) {
-      if (supportedRunners.indexOf(runner) > -1) {
-        var runnerData = taskData.execution[runner];
-        if (!runnerData.target) {
-          issues.push(vn + ": execution." + runner + ".target is required");
-        } else {
-          const target = runnerData.target.replace(/\$\(\s*currentdirectory\s*\)/i, ".");
+  issues.push(...validateAllExecutionHandlers(taskPath, taskData, vn));
 
-          // target contains a variable
-          if (target.match(/\$\([^)]+\)/)) {
-            continue;
-          }
-
-          // check if the target file exists
-          if (!fs.existsSync(path.join(path.dirname(taskPath), target))) {
-            issues.push(vn + ": execution target for " + runner + " references file that does not exist: " + target);
-          }
-        }
-      }
-    }
-  }
   // Fix: Return issues array regardless of whether execution block exists or not
   // Previously this return was inside the if(taskData.execution) block, causing
   // tasks without execution configuration to return undefined instead of validation issues
   return (issues.length > 0) ? [taskPath, ...issues] : [];
 }
+
+/**
+   * Validates all execution/prejob/postjob handlers for a task
+   * @param taskPath Path to the original json file
+   * @param taskData The parsed json file
+   * @param vn Name of the task or path
+   * @returns Array of issues found for all handlers
+   */
+function validateAllExecutionHandlers(taskPath: string, taskData: any, vn: string): string[] {
+  const issues: string[] = [];
+  const executionProperties = ['execution', 'prejobexecution', 'postjobexecution'];
+  const supportedRunners = ["Node", "Node10", "Node16", "Node20_1", "PowerShell", "PowerShell3", "Process"];
+  executionProperties.forEach(executionType => {
+    if (taskData[executionType]) {
+      Object.keys(taskData[executionType]).forEach(runner => {
+        if (supportedRunners.indexOf(runner) === -1) return;
+        const target = taskData[executionType][runner]?.target;
+        issues.push(...validateExecutionTarget(taskPath, vn, executionType, runner, target));
+      });
+    }
+  });
+  return issues;
+}
+
+/**
+ * Validates the target property for a given execution handler
+ * @param taskPath Path to the original json file
+ * @param vn Name of the task or path
+ * @param executionType Type of execution handler (execution, prejobexecution, postjobexecution)
+ * @param runner Name of the runner
+ * @param target Execution handler's target
+ * @returns Array of issues found for this runner
+ */
+function validateExecutionTarget(taskPath: string, vn: string, executionType: string, runner: string, target: string | undefined): string[] {
+  const issues: string[] = [];
+  if (!target) {
+    issues.push(`${vn}: ${executionType}.${runner}.target is required`);
+  } else {
+    const normalizedTarget = target.replace(/\$\(\s*currentdirectory\s*\)/i, ".");
+
+    // target contains a variable
+    if (normalizedTarget.match(/\$\([^)]+\)/)) {
+      return issues;
+    }
+
+    // check if the target file exists
+    if (!fs.existsSync(path.join(path.dirname(taskPath), normalizedTarget))) {
+      issues.push(`${vn}: ${executionType}.${runner}.target references file that does not exist: ${normalizedTarget}`);
+    }
+  }
+  return issues;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tfx-cli",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "CLI for Azure DevOps Services and Team Foundation Server",
   "repository": {
     "type": "git",