@sourcemeta/jsonschema 12.9.3 → 12.10.0

package/README.markdown

@@ -132,7 +132,7 @@ Where `X.Y.Z` is replaced with the desired version. For example:
   uses: actions/checkout@v4
 
 - name: Install the JSON Schema CLI
-  uses: sourcemeta/jsonschema@v12.9.3
+  uses: sourcemeta/jsonschema@v12.10.0
 
 # Then use as usual
 - run: jsonschema fmt path/to/schemas --check

package/npm/main.js

@@ -1,6 +1,6 @@
 const os = require('os');
 const path = require('path');
-const fs = require('fs');
+const fs = require('fs/promises');
 const child_process = require('child_process');
 
 const PLATFORM = os.platform() === 'win32' ? 'windows' : os.platform();
@@ -9,31 +9,9 @@ const EXTENSION = PLATFORM === 'windows' ? '.exe' : '';
 const EXECUTABLE = path.join(__dirname, '..', 'build', 'github-releases',
   `jsonschema-${PLATFORM}-${ARCH}${EXTENSION}`);
 
-function spawn(args, options = {}) {
-  const json = options.json === true;
-  const spawnArgs = json ? [...args, '--json'] : args;
-
+function spawnProcess(executable, args, options) {
   return new Promise((resolve, reject) => {
-    if (!fs.existsSync(EXECUTABLE)) {
-      reject(new Error(
-        `The JSON Schema CLI NPM package does not support ${os.platform()} for ${os.arch()} yet. ` +
-        'Please open a GitHub issue at https://github.com/sourcemeta/jsonschema'
-      ));
-      return;
-    }
-
-    if (PLATFORM === 'darwin') {
-      child_process.spawnSync('/usr/bin/xattr', ['-c', EXECUTABLE], { stdio: 'inherit' });
-    }
-
-    const spawnOptions = {
-      windowsHide: true,
-      ...options
-    };
-
-    delete spawnOptions.json;
-
-    const process = child_process.spawn(EXECUTABLE, spawnArgs, spawnOptions);
+    const process = child_process.spawn(executable, args, options);
 
     let stdout = '';
     let stderr = '';
@@ -55,13 +33,42 @@ function spawn(args, options = {}) {
     });
 
     process.on('close', (code) => {
-      resolve({
-        code: code,
-        stdout: json ? JSON.parse(stdout) : stdout,
-        stderr: stderr
-      });
+      resolve({ code, stdout, stderr });
     });
   });
 }
 
+async function spawn(args, options = {}) {
+  const json = options.json === true;
+  const spawnArgs = json ? [...args, '--json'] : args;
+
+  try {
+    await fs.access(EXECUTABLE);
+  } catch {
+    throw new Error(
+      `The JSON Schema CLI NPM package does not support ${os.platform()} for ${os.arch()} yet. ` +
+      'Please open a GitHub issue at https://github.com/sourcemeta/jsonschema'
+    );
+  }
+
+  if (PLATFORM === 'darwin') {
+    await spawnProcess('/usr/bin/xattr', ['-c', EXECUTABLE], { stdio: 'inherit' });
+  }
+
+  const spawnOptions = {
+    windowsHide: true,
+    ...options
+  };
+
+  delete spawnOptions.json;
+
+  const result = await spawnProcess(EXECUTABLE, spawnArgs, spawnOptions);
+
+  return {
+    code: result.code,
+    stdout: json ? JSON.parse(result.stdout) : result.stdout,
+    stderr: result.stderr
+  };
+}
+
 module.exports = { spawn };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sourcemeta/jsonschema",
-  "version": "12.9.3",
+  "version": "12.10.0",
   "description": "The CLI for working with JSON Schema. Covers formatting, linting, testing, and much more for both local development and CI/CD pipelines",
   "main": "npm/main.js",
   "exports": {