improve error handling when calling json-to-go.js

mholt · Jul 26, 2024 · 93b78ea · 93b78ea
1 parent b490b8c
commit 93b78ea
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/.github/workflows/node-tests.yml b/.github/workflows/node-tests.yml
@@ -54,3 +54,13 @@ jobs:
           exp=$(cat tests/double-nested-objects.go)
           echo "got: '${got}'"
           [[ "${got}" == "${exp}" ]]
+
+      - name: Check correct error handling using stdin
+        shell: bash
+        run: |
+          ! node json-to-go.js <<< "error"
+
+      - name: Check correct error handling with a file
+        shell: bash
+        run: |
+          ! node json-to-go.js <(echo "error")
diff --git a/json-to-go.js b/json-to-go.js
@@ -498,6 +498,15 @@ if (typeof module != 'undefined') {
 		let bigstdin = false
 		let filename = null
 
+		function jsonToGoWithErrorHandling(json) {
+			const output = jsonToGo(json)
+			if (output.error) {
+				console.error(output.error)
+				process.exitCode = 1
+			}
+			process.stdout.write(output.go)
+		}
+
 		process.argv.forEach((val, index) => {
 			if (index < 2)
 				return
@@ -519,7 +528,7 @@ if (typeof module != 'undefined') {
 		if (filename) {
 			const fs = require('fs');
 			const json = fs.readFileSync(filename, 'utf8');
-			process.stdout.write(jsonToGo(json).go)
+			jsonToGoWithErrorHandling(json)
 			return
 		}
 
@@ -530,15 +539,15 @@ if (typeof module != 'undefined') {
 			})
 			process.stdin.on('end', function() {
 				const json = Buffer.concat(bufs).toString('utf8')
-				process.stdout.write(jsonToGo(json).go)
+				jsonToGoWithErrorHandling(json)
 			})
 			return
 		}
 
 		// read from stdin
 		process.stdin.on('data', function(buf) {
 			const json = buf.toString('utf8')
-			process.stdout.write(jsonToGo(json).go)
+			jsonToGoWithErrorHandling(json)
 		})
 	} else {
 		module.exports = jsonToGo