zarro 1.208.0 → 1.208.2

package/gulp-tasks/build.js

@@ -26,7 +26,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
     gulp.task("build", "Builds Visual Studio solutions in tree", ["prebuild"], tryBuild);
     gulp.task("quick-build", "Quick build without pre-cursors", tryBuild);
     async function tryBuild() {
-        return tryDo(build, "BUILD_RETRIES", e => console.error(chalk.red(`Build fails: ${e}`)), () => console.log(chalk.magentaBright(`Build fails! If the error looks transient, I suggest setting the environment variable 'BUILD_RETRIES' to some number > 0 🔨.`)));
+        return tryDo(build, "BUILD_RETRIES", e => console.error(chalk.red(`Build fails: ${e}`)), e => console.log(chalk.magentaBright(`
+Build fails! 
+
+${e}
+
+If the error looks transient, I suggest setting the environment 
+  variable 'BUILD_RETRIES' to some number > 0
+`.trim())));
     }
     async function build() {
         const slnMasks = resolveMasks(env.BUILD_INCLUDE, [env.BUILD_EXCLUDE, env.BUILD_ADDITIONAL_EXCLUDE]);

package/gulp-tasks/modules/env.js

@@ -293,10 +293,6 @@
         if (fileExistsSync(name)) {
             return (readTextFileSync(name) || "").trim();
         }
-        else {
-            const { lsSync } = require("yafs");
-            const files = lsSync(process.cwd());
-        }
     }
     function resolveInternal(name, ignoreDefault, overrideDefault) {
         if (Array.isArray(name)) {

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

@@ -82,9 +82,21 @@
             when: overrideWhenSmaller
         });
         function overrideWhenSmaller(existing, override) {
+            if (!override) {
+                return false;
+            }
+            if (!existing) {
+                return true;
+            }
             const existingNumber = parseInt(`${existing}`, 10);
             const overrideNumber = parseInt(`${override}`, 10);
             if (isNaN(existingNumber) || isNaN(overrideNumber)) {
+                if (!isNaN(existingNumber)) {
+                    return false;
+                }
+                if (!isNaN(overrideNumber)) {
+                    return true;
+                }
                 throw new ZarroError(`Can't determine if override '${override}' should take precedence over '${existing}'`);
             }
             const result = overrideNumber < existingNumber;

package/gulp-tasks/modules/try-do.js

@@ -30,7 +30,7 @@
                 else {
                     if (requestedRetries < 1) {
                         if (onFinalFailure) {
-                            await onFinalFailure();
+                            await onFinalFailure(e);
                         }
                         else {
                             console.log(chalk.magentaBright(`Failed after ${totalAttempts} attempts`));

package/package.json

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

package/types.d.ts

@@ -149,7 +149,7 @@ declare global {
     logic: AsyncVoidFunc<T>,
     retries: number | string,
     onTransientError?: ErrorReporter,
-    onFinalFailure?: VoidVoid
+    onFinalFailure?: ((e: Error) => void) | ((e: Error) => Promise<void>)
   ) => Promise<T>;
   type Optional<T> = T | undefined;
   type Nullable<T> = T | null;