zarro 1.171.2 → 1.172.2

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

@@ -17,6 +17,7 @@
     const log = requireModule("log");
     const env = requireModule("env");
     const Version = requireModule("version");
+    const SystemError = requireModule("system-error");
     const emojiLabels = {
         testing: `🧪 Testing`,
         packing: `📦 Packing`,
@@ -669,8 +670,9 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         }
     }
     async function runDotNetWith(args, opts) {
+        let result;
         try {
-            return await system("dotnet", args, {
+            result = await system("dotnet", args, {
                 stdout: opts.stdout,
                 stderr: opts.stderr,
                 suppressOutput: opts.suppressOutput,
@@ -684,6 +686,11 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             }
             throw e;
         }
+        const errors = result.stderr || [], hasDiedFromException = !!errors.find(s => s.toLowerCase().includes("unhandled exception"));
+        if (!hasDiedFromException) {
+            return result;
+        }
+        throw new SystemError(`dotnet exit code is zero, but stdout contains logging about an unhandled exception:\n${errors.join("\n")}`, result.exe, result.args, result.exitCode || Number.MIN_VALUE, result.stdout, result.stderr);
     }
     function pushMsbuildProperties(args, opts) {
         if (!opts.msbuildProperties) {
@@ -777,9 +784,19 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         const stdout = [];
         opts.stdout = (s) => stdout.push(s);
         opts.suppressOutput = true;
-        const rawResult = await runDotNetWith(args, opts);
+        let rawResult;
+        try {
+            rawResult = await runDotNetWith(args, opts);
+        }
+        catch (e) {
+            if (SystemError.isError(e)) {
+                throw wrapSearchError(e);
+            }
+            throw e;
+        }
         if (system.isError(rawResult)) {
-            throw rawResult;
+            const systemError = rawResult;
+            throw wrapSearchError(systemError);
         }
         const allText = stdout.join(" "), parsed = JSON.parse(allText);
         const finalResult = [];
@@ -808,6 +825,23 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         }
         return finalResult;
     }
+    function wrapSearchError(e) {
+        return new Error(`Unable to perform package search (check your access token if necessary): ${e}`);
+    }
+    function parsePackageSearchResult(stdout) {
+        const allText = stdout.join(" ");
+        let parsed;
+        try {
+            parsed = JSON.parse(allText);
+        }
+        catch (e) {
+            throw new Error(`Unable to parse json from:\n${allText}`);
+        }
+        if (parsed.problems && parsed.problems.length) {
+            throw new Error(`unable to perform package search (check your access token):\n${parsed.problems.join("\n")}`);
+        }
+        return parsed;
+    }
     async function installPackage(opts) {
         if (!opts) {
             throw new Error(`no options passed to 'installPackage' - target project and package name not specified`);

package/gulp-tasks/modules/log.js

@@ -33,9 +33,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
             this._logLevels = new LogLevels();
             this._threshold = INFO;
             this._timestamp = true;
+            this._outputDisabled = false;
             const logLevel = (process.env.LOG_LEVEL || "").toUpperCase();
             this.setThreshold(levels[logLevel] || INFO);
         }
+        get outputDisabled() {
+            return this._outputDisabled;
+        }
+        disableOutput() {
+            this._outputDisabled = true;
+        }
+        enableOutput() {
+            this._outputDisabled = false;
+        }
         get threshold() {
             return this._threshold;
         }
@@ -94,6 +104,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
             this._timestamp = true;
         }
         _print(args, ...styles) {
+            if (this.outputDisabled) {
+                return;
+            }
             let message;
             if (typeof args[0] === "string") {
                 message = args[0];

package/gulp-tasks/modules/system.js

@@ -34,9 +34,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const pre = isWindows
             ? "@echo off"
             : "";
-        const tempFile = await createTempFile(`
-${pre}
-${tempFileContents}
+        const tempFile = await createTempFile(`
+${pre}
+${tempFileContents}
         `.trim());
         programArgs.splice(0, programArgs.length);
         if (isWindows) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.171.2",
+  "version": "1.172.2",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -68,6 +68,7 @@
     "gulp-dotnet-cli": "^1.1.0",
     "gulp-edit-xml": "^3.1.1",
     "gulp-filter": "^6.0.0",
+    "gulp-msbuild": "^0.11.0",
     "lodash.kebabcase": "^4.1.1",
     "node-nuget-client": "^0.12.0",
     "npm-run-all": "^4.1.5",
@@ -126,7 +127,6 @@
     "debugger-is-attached": "^1.2.0",
     "expect-even-more-jest": "^1.15.0",
     "filesystem-sandbox": "^1.20.0",
-    "gulp-msbuild": "^0.11.0",
     "ioredis": "^5.3.2",
     "jest": "^29.6.2",
     "nodemon": "^3.0.1",

package/types.d.ts

@@ -114,6 +114,10 @@ declare global {
 
     threshold: LogThreshold;
 
+    outputDisabled: boolean;
+    enableOutput(): void;
+    disableOutput(): void;
+
   }