azure-pipelines-task-lib 4.12.0 → 4.13.0

package/mock-test.d.ts

@@ -10,7 +10,7 @@ export declare class MockTestRunner {
     succeeded: boolean;
     errorIssues: string[];
     warningIssues: string[];
-    LoadAsync(testPath: string, taskJsonPath?: string): Promise<MockTestRunner>;
+    LoadAsync(testPath?: string, taskJsonPath?: string): Promise<MockTestRunner>;
     get failed(): boolean;
     ran(cmdline: string): boolean;
     createdErrorIssue(message: string): boolean;
@@ -18,12 +18,7 @@ export declare class MockTestRunner {
     stdOutContained(message: string): boolean;
     stdErrContained(message: string): boolean;
     runAsync(nodeVersion?: number): Promise<void>;
-    /**
-    * @deprecated This method uses library which is not prefered to use on production
-    */
-    run(nodeVersion?: number): void;
     private getNodePath;
-    private getNodePathSync;
     private getNodeVersion;
     private getTaskJsonPath;
     private downloadNode;

package/mock-test.js

@@ -39,12 +39,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockTestRunner = void 0;
 var cp = require("child_process");
 var fs = require("fs");
-var ncp = require("child_process");
 var os = require("os");
 var path = require("path");
 var cmdm = require("./taskcommand");
 var shelljs = require("shelljs");
-var deasync = require("deasync");
 var Downloader = require("nodejs-file-downloader");
 var COMMAND_TAG = '[command]';
 var COMMAND_LENGTH = COMMAND_TAG.length;
@@ -65,7 +63,6 @@ var MockTestRunner = /** @class */ (function () {
             return;
         this._taskJsonPath = taskJsonPath || '';
         this._testPath = testPath;
-        this.nodePath = this.getNodePathSync();
     }
     MockTestRunner.prototype.LoadAsync = function (testPath, taskJsonPath) {
         return __awaiter(this, void 0, void 0, function () {
@@ -80,8 +77,12 @@ var MockTestRunner = /** @class */ (function () {
                                         resolve(this);
                                         return [2 /*return*/];
                                     }
-                                    this._taskJsonPath = taskJsonPath || '';
-                                    this._testPath = testPath;
+                                    if (testPath) {
+                                        this._testPath = testPath;
+                                    }
+                                    if (taskJsonPath) {
+                                        this._taskJsonPath = taskJsonPath;
+                                    }
                                     _a = this;
                                     return [4 /*yield*/, this.getNodePath()];
                                 case 1:
@@ -133,8 +134,15 @@ var MockTestRunner = /** @class */ (function () {
                         return [4 /*yield*/, this.getNodePath(nodeVersion)];
                     case 1:
                         nodePath = _a.sent();
-                        _a.label = 2;
+                        return [3 /*break*/, 4];
                     case 2:
+                        if (!!nodePath) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.getNodePath()];
+                    case 3:
+                        nodePath = _a.sent();
+                        this.nodePath = nodePath;
+                        _a.label = 4;
+                    case 4:
                         spawn = cp.spawnSync(nodePath, [this._testPath]);
                         // Clean environment
                         Object.keys(process.env)
@@ -199,34 +207,23 @@ var MockTestRunner = /** @class */ (function () {
             });
         });
     };
-    /**
-    * @deprecated This method uses library which is not prefered to use on production
-    */
-    MockTestRunner.prototype.run = function (nodeVersion) {
-        var completeExecution = false;
-        this.runAsync(nodeVersion).then(function (t) { return completeExecution = true; });
-        deasync.loopWhile(function () { return !completeExecution; });
-    };
     // Returns a path to node.exe with the correct version for this task (based on if its node10 or node)
     MockTestRunner.prototype.getNodePath = function (nodeVersion) {
         return __awaiter(this, void 0, void 0, function () {
-            var version, downloadVersion, downloadDestination, pathToExe, result;
+            var version, versions, downloadVersion, downloadDestination, pathToExe, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         version = nodeVersion || this.getNodeVersion();
-                        switch (version) {
-                            case 6:
-                                downloadVersion = 'v6.17.1';
-                                break;
-                            case 10:
-                                downloadVersion = 'v10.21.0';
-                                break;
-                            case 16:
-                                downloadVersion = 'v16.13.0';
-                                break;
-                            default:
-                                throw new Error('Invalid node version, must be 6, 10, or 16 (received ' + version + ')');
+                        versions = {
+                            20: 'v20.13.1',
+                            16: 'v16.20.2',
+                            10: 'v10.24.1',
+                            6: 'v6.17.1',
+                        };
+                        downloadVersion = versions[version];
+                        if (!downloadVersion) {
+                            throw new Error('Invalid node version, must be 6, 10, 16 or 20 (received ' + version + ')');
                         }
                         downloadDestination = path.join(downloadDirectory, 'node' + version);
                         pathToExe = this.getPathToNodeExe(downloadVersion, downloadDestination);
@@ -240,12 +237,6 @@ var MockTestRunner = /** @class */ (function () {
             });
         });
     };
-    MockTestRunner.prototype.getNodePathSync = function (nodeVersion) {
-        var nodePath = '';
-        this.getNodePath(nodeVersion).then(function (t) { return nodePath = t; });
-        deasync.loopWhile(function () { return nodePath == ''; });
-        return nodePath;
-    };
     // Determines the correct version of node to use based on the contents of the task's task.json. Defaults to Node 16.
     MockTestRunner.prototype.getNodeVersion = function () {
         var taskJsonPath = this.getTaskJsonPath();
@@ -255,29 +246,27 @@ var MockTestRunner = /** @class */ (function () {
         }
         var taskJsonContents = fs.readFileSync(taskJsonPath, { encoding: 'utf-8' });
         var taskJson = JSON.parse(taskJsonContents);
-        var nodeVersionFound = false;
-        var execution = (taskJson['execution']
-            || taskJson['prejobexecution']
-            || taskJson['postjobexecution']);
-        var keys = Object.keys(execution);
-        for (var i = 0; i < keys.length; i++) {
-            if (keys[i].toLowerCase() == 'node16') {
-                // Prefer node 16 and return immediately.
-                return 16;
-            }
-            else if (keys[i].toLowerCase() == 'node10') {
-                // Prefer node 10 and return immediately.
-                return 10;
-            }
-            else if (keys[i].toLowerCase() == 'node') {
-                nodeVersionFound = true;
+        var nodeVersion = 0;
+        var executors = ['execution', 'prejobexecution', 'postjobexecution'];
+        for (var _i = 0, executors_1 = executors; _i < executors_1.length; _i++) {
+            var executor = executors_1[_i];
+            if (!taskJson[executor])
+                continue;
+            for (var _a = 0, _b = Object.keys(taskJson[executor]); _a < _b.length; _a++) {
+                var key = _b[_a];
+                var currExecutor = key.toLocaleLowerCase();
+                if (!currExecutor.startsWith('node'))
+                    continue;
+                var version = currExecutor.replace('node', '');
+                var intVersion = parseInt(version) || 6; // node handler is node v6 by default
+                nodeVersion = Math.max(intVersion, nodeVersion);
             }
         }
-        if (!nodeVersionFound) {
+        if (nodeVersion === 0) {
             console.warn('Unable to determine execution type from task.json, defaulting to use Node 16');
             return 16;
         }
-        return 6;
+        return nodeVersion;
     };
     // Returns the path to the task.json for the task being tested. Returns null if unable to find it.
     // Searches by moving up the directory structure from the initial starting point and checking at each level.
@@ -389,7 +378,7 @@ var MockTestRunner = /** @class */ (function () {
                         originalCwd = process.cwd();
                         process.chdir(downloadDestination);
                         try {
-                            ncp.execSync("tar -xzf \"" + path.join(downloadDestination, tarGzName) + "\"");
+                            cp.execSync("tar -xzf \"" + path.join(downloadDestination, tarGzName) + "\"");
                         }
                         catch (_b) {
                             throw new Error('Failed to unzip node tar.gz from ' + url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-pipelines-task-lib",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "Azure Pipelines Task SDK",
   "main": "./task.js",
   "typings": "./task.d.ts",
@@ -28,7 +28,6 @@
   "homepage": "https://github.com/Microsoft/azure-pipelines-task-lib",
   "dependencies": {
     "adm-zip": "^0.5.10",
-    "deasync": "^0.1.28",
     "minimatch": "3.0.5",
     "nodejs-file-downloader": "^4.11.1",
     "q": "^1.5.1",