Take NPM packaging logic out of npm-deploy.sh

Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

.github/workflows/package.yml

@@ -191,7 +191,7 @@ jobs:
           node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
       - name: Publish to NPM
-        run: sudo npm install --global npm@latest && ./npm-deploy.sh ${{ github.ref_name }}
+        run: sudo npm install --global npm@latest && ./npm-pack.sh ./build/npm/dist && npm publish ./build/npm/dist
 
   publish-pypi:
     needs: publish

.github/workflows/test.yml

@@ -115,6 +115,12 @@ jobs:
       - run: ./test/docker/help.sh
       - run: ./test/docker/bundle_fmt.sh
 
+  npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: ./npm-pack.sh ./build/npm/dist
+
   snap:
     strategy:
       fail-fast: false

.gitignore

@@ -12,3 +12,4 @@ _deps
 Brewfile.lock.json
 .DS_Store
 *.snap
+/node_modules

.npmignore

@@ -0,0 +1,8 @@
+*
+!LICENSE
+!README.markdown
+!package.json
+!package-lock.json
+!*.js
+!*.mjs
+!build/github-releases/*

cli.js

@@ -0,0 +1,29 @@
+#!/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, 'build', 'github-releases', `jsonschema-${PLATFORM}-${ARCH}.exe`)
+  : path.join(__dirname, 'build', 'github-releases', `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);

eslint.config.mjs

@@ -0,0 +1,10 @@
+import { defineConfig } from "eslint/config";
+import globals from "globals";
+import js from "@eslint/js";
+
+export default defineConfig([
+  { files: ["**/*.{js,mjs,cjs}"] },
+  { files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
+  { files: ["**/*.{js,mjs,cjs}"], languageOptions: { globals: globals.node } },
+  { files: ["**/*.{js,mjs,cjs}"], plugins: { js }, extends: ["js/recommended"] },
+]);

npm-deploy.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+if [ $# -lt 1 ]
+then
+  echo "Usage: $0 <directory>" 1>&2
+  exit 1
+fi
+
+VERSION="$(jq '.version' --raw-output package.json | tr -d 'v')"
+DIRECTORY="$1"
+OUTPUT="$(pwd)/build"
+
+# (1) Download artifacts
+mkdir -p "$OUTPUT/npm/artifacts"
+echo "Preparing $VERSION" 1>&2
+PACKAGE_BASE_URL="https://github.com/sourcemeta/jsonschema/releases/download/v$VERSION"
+curl --retry 5 --location --output "$OUTPUT/npm/artifacts/darwin-arm64.zip" \
+  "$PACKAGE_BASE_URL/jsonschema-$VERSION-darwin-arm64.zip"
+curl --retry 5 --location --output "$OUTPUT/npm/artifacts/darwin-x86_64.zip" \
+  "$PACKAGE_BASE_URL/jsonschema-$VERSION-darwin-x86_64.zip"
+curl --retry 5 --location --output "$OUTPUT/npm/artifacts/linux-x86_64.zip" \
+  "$PACKAGE_BASE_URL/jsonschema-$VERSION-linux-x86_64.zip"
+curl --retry 5 --location --output "$OUTPUT/npm/artifacts/linux-arm64.zip" \
+  "$PACKAGE_BASE_URL/jsonschema-$VERSION-linux-arm64.zip"
+curl --retry 5 --location --output "$OUTPUT/npm/artifacts/windows-x86_64.zip" \
+  "$PACKAGE_BASE_URL/jsonschema-$VERSION-windows-x86_64.zip"
+unzip -o "$OUTPUT/npm/artifacts/darwin-arm64.zip" -d "$OUTPUT/npm/artifacts"
+unzip -o "$OUTPUT/npm/artifacts/darwin-x86_64.zip" -d "$OUTPUT/npm/artifacts"
+unzip -o "$OUTPUT/npm/artifacts/linux-x86_64.zip" -d "$OUTPUT/npm/artifacts"
+unzip -o "$OUTPUT/npm/artifacts/linux-arm64.zip" -d "$OUTPUT/npm/artifacts"
+unzip -o "$OUTPUT/npm/artifacts/windows-x86_64.zip" -d "$OUTPUT/npm/artifacts"
+ls -l "$OUTPUT/npm/artifacts"
+
+# (2) Stage package contents
+rm -rf "$OUTPUT/github-releases"
+mkdir -p "$OUTPUT/github-releases"
+
+install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-darwin-arm64/bin/jsonschema" \
+  "$OUTPUT/github-releases/jsonschema-darwin-arm64"
+install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-darwin-x86_64/bin/jsonschema" \
+  "$OUTPUT/github-releases/jsonschema-darwin-x86_64"
+install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-linux-x86_64/bin/jsonschema" \
+  "$OUTPUT/github-releases/jsonschema-linux-x86_64"
+install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-linux-arm64/bin/jsonschema" \
+  "$OUTPUT/github-releases/jsonschema-linux-arm64"
+install -m 0755 "$OUTPUT/npm/artifacts/jsonschema-$VERSION-windows-x86_64/bin/jsonschema.exe" \
+  "$OUTPUT/github-releases/jsonschema-windows-x86_64.exe"
+
+# (3) Run checks
+npm ci
+npm test
+node cli.js
+
+# (4) Package
+mkdir -p "$DIRECTORY"
+npm pack --pack-destination "$DIRECTORY"