zarro 1.203.0 → 1.204.1

package/gulp-tasks/modules/register-environment-variables.js

@@ -180,6 +180,11 @@
             help: `comma-separated list of exclusions for tests${extra}`,
             default: defaultTestExclude
         });
+        env.register({
+            name: "TEST_ORDER",
+            help: "comma-separated list of project names or paths to use as an ordering guide when testing dotnet projects",
+            default: ""
+        });
         env.register({
             name: "TEST_ADDITIONAL_EXCLUDE",
             help: "And additional list of test exclusions - perhaps you'd like a subset test task?"

package/gulp-tasks/modules/test-dotnet-logic.js

@@ -146,6 +146,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
         logParallelState(testInParallel, parallelFlag);
         return testInParallel;
     }
+    function sortTestProjects(testProjects) {
+        const envOrder = env.resolveArray(env.TEST_ORDER);
+        if (envOrder.length === 0) {
+            return testProjects;
+        }
+        const rankLookup = envOrder.reduce((acc, cur, idx) => {
+            acc[cur] = testProjects.length - idx;
+            return acc;
+        }, {});
+        const result = [...testProjects];
+        const rankKeys = Object.keys(rankLookup);
+        return result.sort((a, b) => {
+            const rankA = findProjectRank(rankLookup, rankKeys, a), rankB = findProjectRank(rankLookup, rankKeys, b);
+            if (rankA === rankB) {
+                return 0;
+            }
+            return rankA > rankB ? -1 : 1;
+        });
+    }
+    function findProjectRank(lookup, keys, seek) {
+        var _a;
+        const k = findBestMatch(seek, keys);
+        if (!k) {
+            return 0;
+        }
+        return (_a = lookup[k]) !== null && _a !== void 0 ? _a : 0;
+    }
+    function findBestMatch(needle, haystack) {
+        const lowerNeedle = needle.toLowerCase();
+        for (const key of haystack) {
+            const lowerKey = key.toLowerCase();
+            if (lowerKey.endsWith(lowerNeedle)) {
+                return key;
+            }
+            const project = path.basename(lowerNeedle)
+                .replace(/\.dll$/i, "")
+                .replace(/\.csproj$/i, "");
+            if (project === key) {
+                return key;
+            }
+        }
+    }
     async function testAsDotNetCore(configuration, testProjects) {
         const runInParallel = requireModule("run-in-parallel"), testResults = {
             quackersEnabled: false,
@@ -271,7 +313,7 @@ Test Run Summary
             acc.push({ project, runTimeMs: cur.runTimeMs });
             return acc;
         }, []);
-        console.log(yellow(`Test suite timings:`));
+        console.log(yellow(`\nTest suite timings:`));
         for (const r of assembliesAndTimes) {
             console.log(yellow(`  ${r.project}: ${nunitLikeTime(r.runTimeMs)}`));
         }
@@ -592,6 +634,7 @@ Test Run Summary
         shouldTestInParallel,
         testOneDotNetCoreProject,
         testAsDotNetCore,
-        logTestSuiteTimes
+        logTestSuiteTimes,
+        sortTestProjects
     };
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.203.0",
+  "version": "1.204.1",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "index.js"

package/types.d.ts

@@ -284,6 +284,7 @@ declare global {
     testAsDotNetCore: DotNetTester;
     shouldTestInParallel: (testProjectPaths: string[]) => Promise<boolean>;
     logTestSuiteTimes: (results: ResultOrError[], styleFn: StyleFunction) => void;
+    sortTestProjects: (projects: string[]) => string;
     testOneDotNetCoreProject: (
       target: string,
       configuration: string,
@@ -403,6 +404,7 @@ declare global {
     "NUNIT_LABELS" |
     "NUNIT_PROCESS" |
     "TEST_INCLUDE" |
+    "TEST_ORDER" |
     "TEST_ADDITIONAL_INCLUDE" |
     "TEST_EXCLUDE" |
     "TEST_ADDITIONAL_EXCLUDE" |
@@ -611,6 +613,7 @@ declare global {
     NUNIT_LABELS: StringEnvVar; // for now, at least
     NUNIT_PROCESS: StringEnvVar;
     TEST_INCLUDE: StringEnvVar;
+    TEST_ORDER: StringEnvVar;
     TEST_ADDITIONAL_INCLUDE: StringEnvVar;
     TEST_EXCLUDE: StringEnvVar;
     TEST_ADDITIONAL_EXCLUDE: StringEnvVar;