@sourcemeta/jsonschema 12.7.1 → 12.9.3

package/{README.md → 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.7.1
+  uses: sourcemeta/jsonschema@v12.9.3
 
 # Then use as usual
 - run: jsonschema fmt path/to/schemas --check

package/npm/cli.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+
+const { spawn } = require('./main.js');
+
+spawn(process.argv.slice(2), { stdio: 'inherit' })
+  .then((result) => {
+    process.exit(result.code);
+  })
+  .catch((error) => {
+    console.error(error.message);
+    process.exit(1);
+  });

package/npm/main.js

@@ -0,0 +1,67 @@
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+const child_process = require('child_process');
+
+const PLATFORM = os.platform() === 'win32' ? 'windows' : os.platform();
+const ARCH = os.arch() === 'x64' ? 'x86_64' : os.arch();
+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;
+
+  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);
+
+    let stdout = '';
+    let stderr = '';
+
+    if (process.stdout) {
+      process.stdout.on('data', (data) => {
+        stdout += data.toString();
+      });
+    }
+
+    if (process.stderr) {
+      process.stderr.on('data', (data) => {
+        stderr += data.toString();
+      });
+    }
+
+    process.on('error', (error) => {
+      reject(error);
+    });
+
+    process.on('close', (code) => {
+      resolve({
+        code: code,
+        stdout: json ? JSON.parse(stdout) : stdout,
+        stderr: stderr
+      });
+    });
+  });
+}
+
+module.exports = { spawn };

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@sourcemeta/jsonschema",
-  "version": "12.7.1",
+  "version": "12.9.3",
   "description": "The CLI for working with JSON Schema. Covers formatting, linting, testing, and much more for both local development and CI/CD pipelines",
-  "main": "cli.js",
-  "bin": {
-    "jsonschema": "cli.js"
+  "main": "npm/main.js",
+  "exports": {
+    ".": "./npm/main.js",
+    "./package.json": "./package.json"
   },
-  "scripts": {
-    "test": "eslint cli.js && node cli.js"
+  "bin": {
+    "jsonschema": "npm/cli.js"
   },
   "license": "AGPL-3.0",
   "homepage": "https://github.com/sourcemeta/jsonschema",
@@ -16,18 +17,38 @@
     "name": "Sourcemeta",
     "url": "https://www.sourcemeta.com"
   },
-  "os": [ "darwin", "linux", "win32" ],
-  "cpu": [ "x64", "arm64" ],
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ],
+  "cpu": [
+    "x64",
+    "arm64"
+  ],
   "engines": {
     "node": ">=16"
   },
   "funding": "https://github.com/sponsors/sourcemeta",
   "keywords": [
-    "jsonschema", "json", "schema", "json-schema",
-    "cli", "$ref", "dereference", "reference", "resolve",
-    "json-pointer", "validator", "validation", "bundle",
-    "json-schema-validator", "json-schema-validation",
-    "lint", "format", "draft"
+    "jsonschema",
+    "json",
+    "schema",
+    "json-schema",
+    "cli",
+    "$ref",
+    "dereference",
+    "reference",
+    "resolve",
+    "json-pointer",
+    "validator",
+    "validation",
+    "bundle",
+    "json-schema-validator",
+    "json-schema-validation",
+    "lint",
+    "format",
+    "draft"
   ],
   "bugs": {
     "url": "https://github.com/sourcemeta/jsonschema/issues"

package/cli.js

@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-const os = require('os');
-const path = require('path');
-const fs = require('fs');
-const child_process = require('child_process');
-
-const PLATFORM = os.platform() === 'win32' ? 'windows' : os.platform();
-const ARCH = os.arch() === 'x64' ? 'x86_64' : os.arch();
-const EXECUTABLE = PLATFORM === 'windows'
-  ? path.join(__dirname, `jsonschema-${PLATFORM}-${ARCH}.exe`)
-  : path.join(__dirname, `jsonschema-${PLATFORM}-${ARCH}`);
-
-if (!fs.existsSync(EXECUTABLE)) {
-  console.error(`The JSON Schema CLI NPM package does not support ${os.platform()} for ${ARCH} yet`);
-  console.error('Please open a GitHub issue at https://github.com/sourcemeta/jsonschema');
-  process.exit(1);
-}
-
-if (PLATFORM === 'darwin') {
-  child_process.spawnSync('/usr/bin/xattr', [ '-c', EXECUTABLE ], { stdio: 'inherit' });
-}
-
-const result = child_process.spawnSync(EXECUTABLE, process.argv.slice(2), {
-  stdio: 'inherit',
-  // Do not open a command prompt on spawning
-  windowsHide: true
-});
-
-process.exit(result.status);