zarro 1.183.1 → 1.183.2

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

@@ -253,7 +253,7 @@
         args.push(opts.url);
         const systemArgs = ["nuget", "add", "source"].concat(args);
         let result = await runDotNetWith(systemArgs, { suppressOutput: true });
-        if (SystemError.isError(result)) {
+        if (system.isError(result)) {
             return result;
         }
         if (opts.enabled === false) {
@@ -845,7 +845,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             rawResult = await runDotNetWith(args, opts);
         }
         catch (e) {
-            if (SystemError.isError(e)) {
+            if (system.isError(e)) {
                 throw wrapSearchError(e);
             }
             throw e;

package/gulp-tasks/modules/system-error.js

@@ -60,12 +60,6 @@
         isError() {
             return true;
         }
-        static isSystemError(o) {
-            return o instanceof SystemError;
-        }
-        static isError(o) {
-            return o instanceof SystemError;
-        }
     }
     module.exports = SystemError;
 })();

package/gulp-tasks/modules/system.js

@@ -159,7 +159,7 @@ ${tempFileContents}
                 return [info.exe, (info.args || []).map(q).join(" ")].join(" ");
             }
             function generateError(message, exitCode) {
-                if (SystemError.isError(result)) {
+                if (system.isError(result)) {
                     const errorDetails = gatherErrorDetails(result);
                     if (errorDetails) {
                         message = `${message}\n${errorDetails}`;
@@ -226,7 +226,7 @@ ${tempFileContents}
             }
         }
     }
-    system.isError = SystemError.isError;
-    system.isResult = SystemResult.isResult;
+    system.isError = (o) => o instanceof SystemError;
+    system.isResult = (o) => o instanceof SystemResult;
     module.exports = system;
 })();

package/gulp-tasks/nuget-push.js

@@ -32,10 +32,10 @@ const exec_step_1 = require("exec-step");
         for (const file of toPush) {
             await ctx.exec(`⬆️ pushing ${file}`, async () => {
                 const result = await nugetPush(path.join(folder, file));
-                if (SystemError.isError(result)) {
+                if (system.isError(result)) {
                     throw result;
                 }
-                if (SystemError.isResult(result)) {
+                if (system.isResult(result)) {
                     const res = result;
                     const io = res.stderr.concat(res.stdout);
                     const isConflict = io.find(s => s.includes("409"));

package/package.json

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

package/types.d.ts

@@ -1217,10 +1217,6 @@ declare global {
     exitCode?: number;
     stderr: string[];
     stdout: string[];
-
-    isResult(): this is SystemResult;
-
-    isError(): this is SystemError;
   }
 
   interface SystemResultBuilder {
@@ -1255,10 +1251,6 @@ declare global {
     exitCode: number;
     stderr: string[];
     stdout: string[];
-
-    isError(o: any): o is SystemError;
-
-    isResult(o: any): o is SystemError;
   }
 
   type SystemFunction = (program: string, args?: string[], options?: SystemOptions)
@@ -1267,7 +1259,6 @@ declare global {
   interface System
     extends SystemFunction {
     isError(o: any): o is SystemError;
-
     isResult(o: any): o is SystemResult;
   }