azure-pipelines-task-lib 5.2.0 → 5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-pipelines-task-lib",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "Azure Pipelines Task SDK",
   "main": "./task.js",
   "typings": "./task.d.ts",

package/task.js

@@ -907,9 +907,8 @@ function ls(optionsOrPaths) {
         isRecursive = options.includes('r');
         includeHidden = options.includes('a');
     }
-    // Flatten paths if the paths argument is array
     if (Array.isArray(paths)) {
-        paths = paths.flat(Infinity);
+        paths = flattenArray(paths);
     }
     // If the first argument is not options, then it is a path
     if (typeof optionsOrPaths !== 'string' || !optionsOrPaths.startsWith('-')) {
@@ -932,7 +931,25 @@ function ls(optionsOrPaths) {
     }
     var pathsCopy = __spreadArray([], paths, true);
     var preparedPaths = [];
+    var fileEntries = [];
     try {
+        var remainingPaths = [];
+        while (paths.length > 0) {
+            var pathEntry = resolve(paths.shift());
+            if (pathEntry === null || pathEntry === void 0 ? void 0 : pathEntry.includes('*')) {
+                remainingPaths.push(pathEntry);
+                continue;
+            }
+            var stats_2 = fs.lstatSync(pathEntry);
+            if (stats_2.isFile()) {
+                var fileName = path.basename(pathEntry);
+                fileEntries.push(fileName);
+            }
+            else {
+                remainingPaths.push(pathEntry);
+            }
+        }
+        paths.push.apply(paths, remainingPaths);
         var _loop_1 = function () {
             var pathEntry = resolve(paths.shift());
             if (pathEntry === null || pathEntry === void 0 ? void 0 : pathEntry.includes('*')) {
@@ -972,7 +989,8 @@ function ls(optionsOrPaths) {
         while (preparedPaths.length > 0) {
             _loop_2();
         }
-        return entries;
+        var finalResults = __spreadArray(__spreadArray([], fileEntries, true), entries, true);
+        return finalResults;
     }
     catch (error) {
         if (error.code === 'ENOENT') {
@@ -984,6 +1002,11 @@ function ls(optionsOrPaths) {
     }
 }
 exports.ls = ls;
+function flattenArray(arr) {
+    return arr.reduce(function (flat, toFlatten) {
+        return flat.concat(Array.isArray(toFlatten) ? flattenArray(toFlatten) : toFlatten);
+    }, []);
+}
 /**
  * Copies a file or folder.
  * @param   {string}  sourceOrOptions          - Either the source path or an option string '-r', '-f' , '-n' or '-rfn' for recursive, force and no-clobber.
@@ -1237,7 +1260,7 @@ function find(findPath, options) {
         var _loop_3 = function () {
             // pop the next item and push to the result array
             var item = stack.pop(); // non-null because `stack.length` was truthy
-            var stats_2 = void 0;
+            var stats_3 = void 0;
             try {
                 // `item.path` equals `findPath` for the first item to be processed, when the `result` array is empty
                 var isPathToSearch = !result.length;
@@ -1246,7 +1269,7 @@ function find(findPath, options) {
                 // following all symlinks or following symlink for the specified path
                 var followSymbolicLink = options.followSymbolicLinks || followSpecifiedSymbolicLink;
                 // stat the item. The stat info is used further below to determine whether to traverse deeper
-                stats_2 = _getStats(item.path, followSymbolicLink, options.allowBrokenSymbolicLinks);
+                stats_3 = _getStats(item.path, followSymbolicLink, options.allowBrokenSymbolicLinks);
             }
             catch (err) {
                 if (err.code == 'ENOENT' && options.skipMissingFiles) {
@@ -1257,7 +1280,7 @@ function find(findPath, options) {
             }
             result.push(item.path);
             // note, isDirectory() returns false for the lstat of a symlink
-            if (stats_2.isDirectory()) {
+            if (stats_3.isDirectory()) {
                 (0, exports.debug)("  ".concat(item.path, " (directory)"));
                 if (options.followSymbolicLinks) {
                     // get the realpath
@@ -1505,8 +1528,8 @@ function rmRF(inputPath) {
                 (0, exports.debug)('removing symbolic link ' + inputPath);
                 var realPath = fs.readlinkSync(inputPath);
                 if (fs.existsSync(realPath)) {
-                    var stats_3 = fs.statSync(realPath);
-                    if (stats_3.isDirectory()) {
+                    var stats_4 = fs.statSync(realPath);
+                    if (stats_4.isDirectory()) {
                         childProcess.execFileSync("cmd.exe", ["/c", "rd", "/s", "/q", realPath]);
                         fs.unlinkSync(inputPath);
                     }
@@ -1551,8 +1574,8 @@ function rmRF(inputPath) {
                     (0, exports.debug)('removing symbolic link ' + inputPath);
                     var realPath = fs.readlinkSync(inputPath);
                     if (fs.existsSync(realPath)) {
-                        var stats_4 = fs.statSync(realPath);
-                        if (stats_4.isDirectory()) {
+                        var stats_5 = fs.statSync(realPath);
+                        if (stats_5.isDirectory()) {
                             fs.rmSync(realPath, { recursive: true, force: true });
                             fs.unlinkSync(inputPath);
                         }