zarro 1.170.4 → 1.170.8

package/gulp-tasks/modules/nuget-push.js

@@ -13,7 +13,7 @@
         const nugetPushSource = sourceName ||
             env.resolve(env.NUGET_PUSH_SOURCE, env.NUGET_SOURCE) ||
             "nuget.org";
-        const apiKey = resolveNugetApiKey(nugetPushSource);
+        const apiKey = await resolveNugetApiKey(nugetPushSource);
         options = options || {};
         options.skipDuplicates = options.skipDuplicates === undefined
             ? env.resolveFlag("NUGET_IGNORE_DUPLICATE_PACKAGES")

package/gulp-tasks/modules/resolve-nuget-api-key.js

@@ -1,12 +1,12 @@
 "use strict";
 (function () {
-    const env = requireModule("env");
-    function resolveNugetApiKey(source) {
+    const env = requireModule("env"), log = requireModule("log"), { listNugetSources } = requireModule("dotnet-cli");
+    async function resolveNugetApiKey(source) {
         const allKeys = resolveSourceToKeyLookup(), requestedSource = resolveSource(source);
         if (!requestedSource) {
             return findValue(allKeys, "nuget.org") || findValue(allKeys, "*");
         }
-        const perSource = findValue(allKeys, requestedSource), multiKeyFallback = findValue(allKeys, "*"), nugetOrgFallback = findValue(allKeys, "nuget.org"), ultimateFallback = env.resolve(env.NUGET_API_KEY);
+        const perSource = findValue(allKeys, requestedSource, await resolveSourceName(requestedSource)), multiKeyFallback = findValue(allKeys, "*"), nugetOrgFallback = findValue(allKeys, "nuget.org"), ultimateFallback = env.resolve(env.NUGET_API_KEY);
         return perSource || multiKeyFallback || nugetOrgFallback || ultimateFallback || undefined;
     }
     function resolveSourceToKeyLookup() {
@@ -32,15 +32,23 @@
             ["*"]: k
         };
     }
-    function findValue(keys, seek) {
-        if (!keys || !seek) {
+    function findValue(data, ...seekKeys) {
+        if (!data || !seekKeys) {
             return undefined;
         }
-        const exactMatch = keys[seek];
-        if (exactMatch) {
-            return exactMatch;
+        const setValues = seekKeys.filter(s => !!s);
+        const uniqueKeys = new Set(setValues);
+        for (let seek of uniqueKeys) {
+            const exactMatch = data[seek];
+            if (exactMatch) {
+                return exactMatch;
+            }
+            const thisPass = fuzzyFindValue(data, seek);
+            if (thisPass) {
+                return thisPass;
+            }
         }
-        return fuzzyFindValue(keys, seek);
+        return undefined;
     }
     function fuzzyFindValue(keys, seek) {
         const keyLookup = Object.keys(keys)
@@ -51,6 +59,29 @@
         const key = keyLookup[seek.toLowerCase()];
         return keys[key];
     }
+    async function resolveSourceName(sourceToResolve) {
+        const sources = await listNugetSources();
+        for (const source of sources) {
+            if (source.name.toLowerCase() === sourceToResolve.toLowerCase()) {
+                return source.name;
+            }
+            if (source.url.toLowerCase() === sourceToResolve.toLowerCase()) {
+                return source.name;
+            }
+        }
+        if (!!process.env[env.NUGET_API_KEY] && looksLikeUrl(sourceToResolve)) {
+            return undefined;
+        }
+        log.warn(`Unable to match provided nuget push source '${sourceToResolve}' to the url or name of any registered source on this machine`);
+        log.warn(`  known sources are:`);
+        for (const source of sources) {
+            log.warn(`    ${source.name}: ${source.url} (${source.enabled ? "enabled" : "disabled"})`);
+        }
+        return undefined;
+    }
+    function looksLikeUrl(str) {
+        return !!str && str.includes("://");
+    }
     function resolveSource(source) {
         if (source) {
             return source;

package/gulp-tasks/modules/which.js

@@ -1,9 +1,13 @@
 "use strict";
 (function () {
     const _which_ = require("which");
+    const cache = {};
     module.exports = function which(executable) {
+        if (cache[executable]) {
+            return cache[executable];
+        }
         try {
-            return _which_.sync(executable);
+            return cache[executable] = _which_.sync(executable);
         }
         catch (e) {
             return undefined;

package/gulp-tasks/nuget-push.js

@@ -1,7 +1,7 @@
 "use strict";
 (function () {
     gulp.task("nuget-push", "Pushes the latest versions of packages in the package build dir", async () => {
-        const debug = requireModule("debug")(__filename), path = require("path"), nugetPush = requireModule("nuget-push"), { ls, FsEntities } = require("yafs"), env = requireModule("env"), folder = env.resolve(env.PACK_TARGET_FOLDER), versionRe = /^(?<id>[A-Za-z\.]+)\.(?<version>\d\.\d\.\d)(-(?<tag>.*))?.nupkg$/, packages = await ls(folder, {
+        const debug = requireModule("debug")(__filename), path = require("path"), nugetPush = requireModule("nuget-push"), { ls, FsEntities } = require("yafs"), env = requireModule("env"), folder = env.resolve(env.PACK_TARGET_FOLDER), versionRe = /^(?<id>[A-Za-z\.]+)\.(?<version>\d\.\d\.\d)(-(?<tag>.*))?\.nupkg$/, packages = await ls(folder, {
             recurse: false,
             entities: FsEntities.files,
             match: versionRe

package/gulp-tasks/release-nuget.js

@@ -30,7 +30,7 @@
                 await nugetPush({
                     source,
                     target: pkg,
-                    apiKey: resolveNugetApiKey(source)
+                    apiKey: await resolveNugetApiKey(source)
                 });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.170.4",
+  "version": "1.170.8",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -121,6 +121,7 @@
     "@types/semver": "^7.5.0",
     "@types/through2": "^2.0.38",
     "@types/typescript": "^2.0.0",
+    "@types/which": "^3.0.3",
     "@types/xml2js": "^0.4.8",
     "@types/yargs": "^15.0.13",
     "console-cls": "^1.2.2",

package/types.d.ts

@@ -531,7 +531,7 @@ declare global {
     open(url: string): Promise<void>;
   }
 
-  type ResolveNugetApiKey = (forSource?: string) => Optional<string>;
+  type ResolveNugetApiKey = (forSource?: string) => Promise<Optional<string>>;
 
   interface Env
     extends Dictionary<any> {