zarro 1.178.0 → 1.179.2

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

@@ -1,9 +1,11 @@
 "use strict";
 (function () {
+    const debug = requireModule("debug")(__filename);
     const system = requireModule("system");
     const { types } = require("util");
     const { isRegExp } = types;
     const ZarroError = requireModule("zarro-error");
+    const sleep = requireModule("sleep");
     const path = require("path");
     const { fileExists, readTextFile, ls, FsEntities } = require("yafs");
     const { yellow } = requireModule("ansi-colors");
@@ -250,10 +252,14 @@
         pushIfSet(args, opts.configFile, "--configfile");
         args.push(opts.url);
         const systemArgs = ["nuget", "add", "source"].concat(args);
-        await runDotNetWith(systemArgs, { suppressOutput: true });
+        let result = await runDotNetWith(systemArgs, { suppressOutput: true });
+        if (SystemError.isError(result)) {
+            return result;
+        }
         if (opts.enabled === false) {
-            await disableNugetSource(opts.name);
+            result = await disableNugetSource(opts.name);
         }
+        return result;
     }
     async function removeNugetSource(source) {
         if (!source) {
@@ -270,7 +276,7 @@
         if (!toEnable) {
             throw new ZarroError(`unable to find source matching: ${JSON.stringify(source)}`);
         }
-        await runDotNetWith(["dotnet", "nuget", "enable", "source", toEnable.name], {
+        return await runDotNetWith(["dotnet", "nuget", "enable", "source", toEnable.name], {
             suppressOutput: true
         });
     }
@@ -279,7 +285,7 @@
         if (!toDisable) {
             throw new ZarroError(`unable to find source matching: ${JSON.stringify(source)}`);
         }
-        await runDotNetWith(["dotnet", "nuget", "disable", "source", toDisable.name], {
+        return runDotNetWith(["dotnet", "nuget", "disable", "source", toDisable.name], {
             suppressOutput: true
         });
     }
@@ -416,7 +422,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
                 }
                 pushMsbuildProperties(args, copy);
                 pushAdditionalArgs(args, copy);
-                return await runDotNetWith(args, copy);
+                return runDotNetWith(args, copy);
             }
             catch (e) {
                 throw e;
@@ -792,7 +798,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             ? { search: options }
             : options;
         if (opts.skipCache) {
-            return await searchPackages(opts);
+            return await searchPackagesUncached(opts);
         }
         return await cache.through(JSON.stringify(opts), async () => await searchPackagesUncached(opts), 60 // cache for a minute
         );
@@ -829,6 +835,11 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             throw wrapSearchError(systemError);
         }
         const parsed = parsePackageSearchResult(stdout);
+        debug({
+            label: "searchPackagesUncached: response from package repository",
+            rawResult,
+            parsed
+        });
         const finalResult = [];
         for (const sourceResult of parsed.searchResult) {
             for (const pkg of sourceResult.packages) {
@@ -878,7 +889,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         if (opts.suppressOutput === undefined) {
             opts.suppressOutput = true;
         }
-        await runDotNetWith(args, opts);
+        return await runDotNetWith(args, opts);
     }
     const defaultCreateOptions = {
         skipTemplateUpdateCheck: true
@@ -1082,7 +1093,22 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
     })(DotNetCache || (DotNetCache = {}));
     async function clearCaches(cacheType) {
         const args = ["nuget", "locals", `${cacheType}`, "--clear"];
-        await runDotNetWith(args);
+        let lastError = null;
+        for (let i = 0; i < 10; i++) {
+            try {
+                await runDotNetWith(args);
+                return;
+            }
+            catch (e) {
+                lastError = e;
+                const allLogs = (lastError.stdout || []).concat(lastError.stderr || []);
+                const lockError = !!allLogs.find(s => s.includes("another process"));
+                if (lockError) {
+                    await sleep(500);
+                }
+            }
+        }
+        console.warn(`unable to clear caches:\n${lastError}`);
     }
     clearCaches.all = DotNetCache.all;
     clearCaches.httpCache = DotNetCache.httpCache;

package/gulp-tasks/modules/env.js

@@ -28,7 +28,8 @@
         resolveFlag,
         resolveWithFallback,
         resolveMap,
-        resolveRequired
+        resolveRequired,
+        toBool
     };
     const positives = new Set(["1", "yes", "true"]);
     if (process.env.POSITIVE_FLAG) {
@@ -285,7 +286,7 @@
             // a file name or a path to something
             return undefined;
         }
-        const key = "ZARRO_ALLOW_FILE_RESOLUTIONS", raw = process.env[key], fileResolutionsAreEnabled = resolveAsBoolean(name, raw, true);
+        const key = "ZARRO_ALLOW_FILE_RESOLUTIONS", raw = process.env[key], fileResolutionsAreEnabled = toBool(name, raw, true);
         if (!fileResolutionsAreEnabled) {
             return;
         }
@@ -389,9 +390,9 @@
         const resolved = resolveInternal(name), value = resolved === undefined || resolved === ""
             ? undefined
             : resolved.toLowerCase();
-        return resolveAsBoolean(name, value, fallback);
+        return toBool(name, value, fallback);
     }
-    function resolveAsBoolean(name, value, fallback) {
+    function toBool(name, value, fallback) {
         if (value === undefined && fallback !== undefined) {
             return fallback;
         }

package/index.js

@@ -329,7 +329,72 @@ async function transpileTasksUnder_(folder) {
   }
 }
 
+const timestampMatcher = /\[\d\d:\d\d:\d\d]/;
+
+function patchConsoleOutputToSuppressIntermediateTasks() {
+  patchConsoleFunction("log");
+  patchConsoleFunction("error");
+  // don't need to patch console.warn right now...
+  // patchConsoleFunction("warn");
+
+  const original = process.stdout.write.bind(process.stdout);
+  let last = "";
+  process.stdout.write = (...args) => {
+    const main = plainText(`${ args[0] }`);
+    if (main.match(timestampMatcher) && last.match(timestampMatcher)) {
+      // suppress duplicated timestamps
+      last = main;
+      return;
+    }
+    last = main;
+    original.apply(process.stdout, args);
+  };
+}
+
+// https://stackoverflow.com/a/29497680/1697008
+function plainText(str) {
+  return str.replace(
+    /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, ''
+  );
+}
+
+let eatNewLines = {};
+
+function patchConsoleFunction(fn) {
+  const original = console[fn].bind(console);
+  console[fn] = (...args) => {
+    const main = `${ args[0] }`;
+    if (shouldSuppressLog(main)) {
+      eatNewLines[fn] = true;
+      return;
+    }
+    if (!main.trim() && eatNewLines[fn]) {
+      return;
+    }
+    eatNewLines[fn] = false;
+    original.apply(console, args);
+  };
+}
+
+function shouldSuppressLog(str) {
+  return str.includes("::: [suppress] :::") ||
+    looksLikeAnonymousTaskMessage(str);
+}
+
+function looksLikeAnonymousTaskMessage(str) {
+  if (!str) {
+    return false;
+  }
+  const firstQuotePos = str.indexOf("'");
+  if (firstQuotePos === -1) {
+    return false;
+  }
+  const anonymousPos = str.indexOf("<anonymous>", firstQuotePos);
+  return anonymousPos > -1;
+}
+
 (async function () {
+  patchConsoleOutputToSuppressIntermediateTasks();
   try {
     const rawArgs = await gatherArgs([ path.join(path.dirname(__dirname), ".bin", "zarro"), __filename ]);
     const args = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.178.0",
+  "version": "1.179.2",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "index.js"
@@ -125,7 +125,7 @@
     "console-cls": "^1.2.2",
     "debug": "^4.3.4",
     "debugger-is-attached": "^1.2.0",
-    "expect-even-more-jest": "^1.15.0",
+    "expect-even-more-jest": "^1.19.0",
     "filesystem-sandbox": "^1.20.0",
     "ioredis": "^5.3.2",
     "jest": "^29.6.2",