Merge pull request #787 from peppergrayxyz/png2src_report_error

return png2src error to caller
aduros · Dec 13, 2024 · 363d122 · 363d122
2 parents f5acbb3 + eb2f35f
commit 363d122
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/cli/cli.js b/cli/cli.js
@@ -173,7 +173,12 @@ program.command("png2src <images...>")
         if (!opts.template) {
             opts.lang = requireLang(opts);
         }
-        png2src.runAll(images, opts);
+        try {
+            png2src.runAll(images, opts);
+        } catch (error) {
+            console.error(error.message);
+            process.exit(1);
+        }
     });
 
 program.command("bundle <cart>")

diff --git a/cli/lib/png2src.js b/cli/lib/png2src.js
@@ -352,8 +352,7 @@ function runAll(files, opts) {
 
             output.sprites.push(run(file));
         } catch (error) {
-            console.error("Error processing " + file + ": " + error.message);
-            break;
+            throw new Error("Error processing " + file + ": " + error.message);
         }
     }
 

diff --git a/cli/lib/test/png2src.test.js b/cli/lib/test/png2src.test.js
@@ -165,11 +165,11 @@ describe("PNG2SRC", () => {
     });
 
     it("should abort and output an error message for invalid image paths", () => {
-      runAll(["/invalid/path"], {
+      expect(() => 
+        runAll(["/invalid/path"], {
         lang: "rust",
         output: "-",
-      });
-      expect(console.error).toHaveBeenCalledWith("Error processing /invalid/path: ENOENT: no such file or directory, open '/invalid/path'");
+      })).toThrowError(/Error processing \/invalid\/path: ENOENT: no such file or directory, open '\/invalid\/path'/);
     });
 
     it("should console log one sprite", () => {