zarro 1.170.10 → 1.170.14

package/gulp-tasks/modules/dotnet-cli.js

@@ -16,6 +16,7 @@
     const readNuspecVersion = requireModule("read-nuspec-version");
     const log = requireModule("log");
     const env = requireModule("env");
+    const Version = requireModule("version");
     const emojiLabels = {
         testing: `🧪 Testing`,
         packing: `📦 Packing`,
@@ -669,14 +670,13 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
     }
     async function runDotNetWith(args, opts) {
         try {
-            const result = await system("dotnet", args, {
+            return await system("dotnet", args, {
                 stdout: opts.stdout,
                 stderr: opts.stderr,
                 suppressOutput: opts.suppressOutput,
                 suppressStdIoInErrors: opts.suppressStdIoInErrors,
                 env: opts.env
             });
-            return result;
         }
         catch (e) {
             if (opts.suppressErrors) {
@@ -754,6 +754,57 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             usingFallback
         });
     }
+    async function searchPackages(options) {
+        if (!options) {
+            throw new Error(`No options or search string provided`);
+        }
+        const opts = typeof options === "string"
+            ? { search: options }
+            : options;
+        const args = ["package", "search"];
+        pushIfSet(args, opts.source, "--source");
+        pushFlag(args, opts.exactMatch, "--exact-match");
+        pushFlag(args, opts.preRelease, "--prerelease");
+        pushIfSet(args, opts.configFile, "--configfile");
+        args.push("--format", "json");
+        if (opts.search) {
+            args.push(opts.search);
+        }
+        const stdout = [];
+        opts.stdout = (s) => stdout.push(s);
+        opts.suppressOutput = true;
+        const rawResult = await runDotNetWith(args, opts);
+        if (system.isError(rawResult)) {
+            throw rawResult;
+        }
+        const allText = stdout.join(" "), parsed = JSON.parse(allText);
+        const finalResult = [];
+        const limit = opts.take || Number.MAX_VALUE;
+        for (const sourceResult of parsed.searchResult) {
+            for (const pkg of sourceResult.packages) {
+                finalResult.push({
+                    id: pkg.id,
+                    version: new Version(pkg.latestVersion),
+                    source: sourceResult.sourceName
+                });
+            }
+        }
+        // dotnet package search takes in skip and take parameters,
+        // but there are some potential issues:
+        // 1. when searching for an exact match, it dotnet doesn't apply skip/take
+        //    - so we'd have to do it ourselves anyway
+        // 2. dotnet returns results in ascending version order
+        //    - where the most useful, especially for paging, is reverse-ordered
+        finalResult.sort((a, b) => a.version.compareWith(b.version)).reverse();
+        const skip = opts.skip || 0;
+        if (skip > 0) {
+            finalResult.splice(0, skip);
+        }
+        if (finalResult.length > limit) {
+            finalResult.splice(limit);
+        }
+        return finalResult;
+    }
     module.exports = {
         test,
         build,
@@ -769,6 +820,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         disableNugetSource,
         enableNugetSource,
         tryFindConfiguredNugetSource,
-        incrementTempDbPortHintIfFound
+        incrementTempDbPortHintIfFound,
+        searchPackages
     };
 })();

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

@@ -139,10 +139,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
         if (process.env[parallelVar] === undefined) {
             // automatically test in parallel if possible
             testInParallel = allProjectsReferenceQuackers;
-            if (testInParallel) {
-            }
-            else {
-            }
         }
         else if (parallelFlag && !allProjectsReferenceQuackers) {
             testInParallel = false;
@@ -388,7 +384,7 @@ Test Run Summary
             }
             if (state.inSummary) {
                 /* actual summary log example, using settings
-          
+        
               QUACKERS_LOG_PREFIX = "::",
               QUACKERS_SUMMARY_START_MARKER = `::SS::`,
               QUACKERS_SUMMARY_COMPLETE_MARKER = `::SC::`,
@@ -399,7 +395,7 @@ Test Run Summary
               QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::SSC::",
               QUACKERS_VERBOSE_SUMMARY = "true",
               QUACKERS_OUTPUT_FAILURES_INLINE = "true",
-          
+        
             ::::SS::
             ::::SSS::
             :: {some slow summary data}
@@ -411,14 +407,14 @@ Test Run Summary
             ::Failed:  2
             ::Skipped: 1
             ::Total:   11
-          
+        
             ::Failures:
-          
+        
             ::[1] QuackersTestHost.SomeTests.ShouldBeLessThan50(75)
             ::  NExpect.Exceptions.UnmetExpectationException : Expected 75 to be less than 50
             ::     at QuackersTestHost.SomeTests.ShouldBeLessThan50(Int32 value) in C:\code\opensource\quackers\src\Demo\SomeTests.cs:line 66
             ::
-          
+        
             ::[2] QuackersTestHost.SomeTests.ShouldFail
             ::  NExpect.Exceptions.UnmetExpectationException : Expected false but got true
             ::     at QuackersTestHost.SomeTests.ShouldFail() in C:\code\opensource\quackers\src\Demo\SomeTests.cs:line 28
@@ -477,8 +473,7 @@ Test Run Summary
             }
         }
         catch (e) {
-            const err = e;
-            const err2 = err;
+            debug(`quackersStdOutHandler errors:\n${e}`);
         }
     }
     function incrementTestResultCount(testResults, line) {
@@ -496,7 +491,10 @@ Test Run Summary
         }
     }
     function stripQuackersLogPrefix(line) {
-        return line.substring(quackersLogPrefixLength);
+        while (line.startsWith(QUACKERS_LOG_PREFIX)) {
+            line = line.substring(QUACKERS_LOG_PREFIX.length);
+        }
+        return line;
     }
     const quackersRefCache = {};
     async function projectReferencesQuackers(csproj) {

package/package.json

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

package/types.d.ts

@@ -1,4 +1,4 @@
-// noinspection JSUnusedGlobalSymbols
+// noinspection JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 
 import * as fs from "fs";
 import { StatsBase } from "fs";
@@ -802,6 +802,7 @@ declare global {
   interface PackageInfo {
     id: string;
     version: Version;
+    source?: string;
   }
 
   interface PathUtils {
@@ -827,16 +828,16 @@ declare global {
   // @ts-ignore
   export interface ExecOpts
     extends ExecFileOptionsWithBufferEncoding {
-    // force usage of execfile
+    // force usage of execFile
     _useExecFile?: boolean;
     // exec normally mirrors output (and returns it)
     // -> set this to true to only return the output
-    suppressOutput?: boolean;
+    encoding?: string | null;
 
     // merge stdout & stderr into one output
     mergeIo?: boolean;
 
-    encoding?: string | null;
+    suppressOutput?: boolean;
   }
 
   export interface NugetPushOpts {
@@ -1063,7 +1064,7 @@ declare global {
 
     /**
      * when set true, output will not be echoed back on the
-     * console but you will be able to get it from a custom
+     * console, but you will be able to get it from a custom
      * io writer or the result from after spawn completes
      */
     suppressOutput?: boolean;
@@ -1095,7 +1096,7 @@ declare global {
 
     /**
      * when set true, output will not be echoed back on the
-     * console but you will be able to get it from a custom
+     * console, but you will be able to get it from a custom
      * io writer or the result from after spawn completes
      */
     suppressOutput?: boolean;
@@ -1501,6 +1502,16 @@ declare global {
     timeout?: number;
   }
 
+  interface DotNetSearchPackagesOptions extends DotNetBaseOptions {
+    source?: string;
+    search?: string;
+    take?: number;
+    skip?: number;
+    exactMatch?: boolean;
+    preRelease?: boolean;
+    configFile?: string;
+  }
+
   interface IoConsumers {
     stdout?: IoConsumer;
     stderr?: IoConsumer;
@@ -1561,6 +1572,7 @@ declare global {
   type DotNetEnableNugetSourceFunction = (source: string | NugetSource) => Promise<void>;
   type DotNetDisableNugetSourceFunction = (source: string | NugetSource) => Promise<void>;
   type DotNetTryMatchNugetSourceFunction = (nameOrUrlOrHostOrSpec: string | Partial<NugetSource> | RegExp) => Promise<Optional<NugetSource>>;
+  type DotNetSearchNugetPackagesFunction = (opts: DotNetSearchPackagesOptions | string) => Promise<PackageInfo[]>;
 
   interface DotNetCli {
     clean: DotNetCleanFunction;
@@ -1578,6 +1590,7 @@ declare global {
     disableNugetSource: DotNetDisableNugetSourceFunction;
     tryFindConfiguredNugetSource: DotNetTryMatchNugetSourceFunction;
     incrementTempDbPortHintIfFound: (env: Dictionary<string>) => void;
+    searchPackages: DotNetSearchNugetPackagesFunction;
   }
 
   type ReadCsProjNode = (csproj: string) => Promise<string>;
@@ -1715,7 +1728,7 @@ declare global {
     "bzip2-1.0.5" |
     "bzip2-1.0.6" |
     "Caldera" |
-    "CATOSL-1.1" |
+    "CATO-1.1" |
     "CC-BY-1.0" |
     "CC-BY-2.0" |
     "CC-BY-2.5" |