zarro 1.181.0 → 1.183.0

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

@@ -507,6 +507,15 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         if (!opts.apiKey) {
             throw new ZarroError("apiKey was not specified");
         }
+        const o = opts;
+        // the dotnet cli mentions --skip-duplicate, which makes
+        // sense for a single package, however, as an outer caller
+        // potentially acting on multiple packages will use the
+        // pluralized version, and since I've just spent 1/2 an hour
+        // figuring this out... let's add some boilerplating.
+        if (o.skipDuplicate !== undefined && o.skipDuplicates === undefined) {
+            o.skipDuplicates = o.skipDuplicate;
+        }
         const args = [
             "nuget",
             "push",
@@ -525,7 +534,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         pushIfSet(args, opts.timeout, "--timeout");
         pushFlag(args, opts.disableBuffering, "--disable-buffering");
         pushFlag(args, opts.noSymbols, "--no-symbols");
-        pushFlag(args, opts.skipDuplicate, "--skip-duplicate");
+        pushFlag(args, opts.skipDuplicates, "--skip-duplicate");
         pushFlag(args, opts.noServiceEndpoint, "--no-service-endpoint");
         pushFlag(args, opts.forceEnglishOutput, "--force-english-output");
         pushAdditionalArgs(args, opts);
@@ -788,6 +797,16 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         if (parsed.problems && parsed.problems.length) {
             throw new ZarroError(`unable to perform package search (check your access token):\n${parsed.problems.join("\n")}`);
         }
+        for (const result of parsed.searchResult || []) {
+            for (const pkg of result.packages || []) {
+                if (typeof pkg.version === "string") {
+                    pkg.version = new Version(pkg.version);
+                }
+                if (typeof pkg.latestVersion === "string") {
+                    pkg.latestVersion = new Version(pkg.latestVersion);
+                }
+            }
+        }
         return parsed;
     }
     async function searchPackages(options) {
@@ -804,6 +823,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         );
     }
     async function searchPackagesUncached(opts) {
+        var _a;
         const args = ["package", "search"];
         pushIfSet(args, opts.source, "--source");
         pushFlag(args, opts.exactMatch, "--exact-match");
@@ -843,9 +863,13 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         const finalResult = [];
         for (const sourceResult of parsed.searchResult) {
             for (const pkg of sourceResult.packages) {
+                const version = (_a = pkg.latestVersion) !== null && _a !== void 0 ? _a : pkg.version;
+                if (!version) {
+                    continue;
+                }
                 finalResult.push({
                     id: pkg.id,
-                    version: new Version(pkg.latestVersion),
+                    version: version,
                     source: sourceResult.sourceName
                 });
             }

package/package.json

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

package/types.d.ts

@@ -1539,7 +1539,7 @@ declare global {
     symbolApiKey?: string;
     disableBuffering?: boolean;
     noSymbols?: boolean;
-    skipDuplicate?: boolean;
+    skipDuplicates?: boolean;
     noServiceEndpoint?: boolean;
     forceEnglishOutput?: boolean;
     source?: string;