From 6fa604d45d403f32144bb9219a7486a761170de4 Mon Sep 17 00:00:00 2001 From: Jeffrey Charles Date: Wed, 14 Aug 2024 16:24:51 -0400 Subject: [PATCH] Stop using javy-cli in javy tests (#725) --- npm/javy/package-lock.json | 177 ------------------------------------- npm/javy/package.json | 1 - npm/javy/tests/runner.js | 49 ++++++++-- 3 files changed, 40 insertions(+), 187 deletions(-) diff --git a/npm/javy/package-lock.json b/npm/javy/package-lock.json index 539d5ee7..e002dc96 100644 --- a/npm/javy/package-lock.json +++ b/npm/javy/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "devDependencies": { "@rollup/plugin-node-resolve": "^15.0.1", - "javy-cli": "^0.2.0", "rollup": "^4.1.4", "rollup-plugin-swc": "^0.2.1", "typescript": "^5.2.2", @@ -1026,15 +1025,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/commander": { "version": "9.5.0", "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", @@ -1057,15 +1047,6 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, - "node_modules/data-uri-to-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", - "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -1166,41 +1147,6 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "node_modules/fetch-blob": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", - "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "paypal", - "url": "https://paypal.me/jimmywarting" - } - ], - "dependencies": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - }, - "engines": { - "node": "^12.20 || >= 14.13" - } - }, - "node_modules/formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "dev": true, - "dependencies": { - "fetch-blob": "^3.1.2" - }, - "engines": { - "node": ">=12.20.0" - } - }, "node_modules/fs-extra": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", @@ -1313,19 +1259,6 @@ "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", "dev": true }, - "node_modules/javy-cli": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/javy-cli/-/javy-cli-0.2.0.tgz", - "integrity": "sha512-kxY6+q+1bhXjfFb5o8ETlfKtxEMajSqNB/0G1l9tVfFU0RMYiDHHRQgs2r8cSAZhkEgs2gSKlpxgopQ4NuL6Ig==", - "dev": true, - "dependencies": { - "cachedir": "^2.3.0", - "node-fetch": "^3.2.10" - }, - "bin": { - "javy": "index.js" - } - }, "node_modules/jju": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", @@ -1440,43 +1373,6 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } - ], - "engines": { - "node": ">=10.5.0" - } - }, - "node_modules/node-fetch": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", - "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", - "dev": true, - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -1858,15 +1754,6 @@ "typescript": "*" } }, - "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -2509,12 +2396,6 @@ "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", "dev": true }, - "cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", - "dev": true - }, "commander": { "version": "9.5.0", "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", @@ -2534,12 +2415,6 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, - "data-uri-to-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", - "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", - "dev": true - }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -2616,25 +2491,6 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "fetch-blob": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", - "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", - "dev": true, - "requires": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - } - }, - "formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "dev": true, - "requires": { - "fetch-blob": "^3.1.2" - } - }, "fs-extra": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", @@ -2716,16 +2572,6 @@ "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", "dev": true }, - "javy-cli": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/javy-cli/-/javy-cli-0.2.0.tgz", - "integrity": "sha512-kxY6+q+1bhXjfFb5o8ETlfKtxEMajSqNB/0G1l9tVfFU0RMYiDHHRQgs2r8cSAZhkEgs2gSKlpxgopQ4NuL6Ig==", - "dev": true, - "requires": { - "cachedir": "^2.3.0", - "node-fetch": "^3.2.10" - } - }, "jju": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", @@ -2816,23 +2662,6 @@ "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true }, - "node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "dev": true - }, - "node-fetch": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", - "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", - "dev": true, - "requires": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - } - }, "path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -3061,12 +2890,6 @@ "semver": "^7.5.4" } }, - "web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", - "dev": true - }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", diff --git a/npm/javy/package.json b/npm/javy/package.json index e2d46893..8f75fd1e 100644 --- a/npm/javy/package.json +++ b/npm/javy/package.json @@ -23,7 +23,6 @@ }, "devDependencies": { "@rollup/plugin-node-resolve": "^15.0.1", - "javy-cli": "^0.2.0", "rollup": "^4.1.4", "rollup-plugin-swc": "^0.2.1", "typescript": "^5.2.2", diff --git a/npm/javy/tests/runner.js b/npm/javy/tests/runner.js index ffcdb7ef..1c904729 100644 --- a/npm/javy/tests/runner.js +++ b/npm/javy/tests/runner.js @@ -1,4 +1,6 @@ import { spawn } from "node:child_process"; +import fs from "node:fs"; +import path from "node:path"; import * as stream from "node:stream"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -9,6 +11,7 @@ import { TextEncoderStream, } from "node:stream/web"; import { unlink } from "node:fs/promises"; +import * as gzip from "node:zlib"; import { rollup } from "rollup"; import swc from "rollup-plugin-swc"; @@ -16,10 +19,14 @@ import nodeResolve from "@rollup/plugin-node-resolve"; import * as tests from "./tests.js"; +const JAVY_VERSION = "v3.0.1"; + +const javyPath = path.join(tmpdir(), "javy"); + async function main() { console.log("Running tests..."); - await forceJavyDownload(); // trying to download Javy in parallel causes problems with the tests + await downloadJavy(JAVY_VERSION); const resultPromises = Object.entries(tests).map( async ([testName, testFunc]) => { @@ -41,13 +48,6 @@ async function main() { } await main(); -async function forceJavyDownload() { - let { exitCode, stderr } = await runCommand("javy", ["--version"]); - if (await exitCode !== 0) { - throw Error(await collectStream(stderr)); - } -} - /** * Passes the stream's controller to a callback where strings can be enqueue. * @param {(ctr: ReadableStreamDefaultController) => Promise} f @@ -123,7 +123,7 @@ export async function runJS({ source, stdin, expectedOutput }) { } async function compileWithJavy(infile, outfile) { - const { exitCode, stdout, stderr } = await runCommand("javy", [ + const { exitCode, stdout, stderr } = await runCommand(javyPath, [ "compile", "-o", outfile, @@ -173,3 +173,34 @@ function emptyStream() { }, }); } + +async function downloadJavy(version) { + let platformArch; + if (process.platform === "linux" && (process.arch === "arm" || process.arch === "arm64")) { + platformArch = "arm-linux"; + } else if (process.platform === "linux" && process.arch === "x64") { + platformArch = "x86_64-linux"; + } else if (process.platform === "darwin" && (process.arch === "arm" || process.arch === "arm64")) { + platformArch = "arm-macos"; + } else if (process.platform === "darwin" && process.arch === "x64") { + platformArch = "x86_64-macos"; + } else if (process.platform === "win32" && (process.arch === "x64" || process.arch === "ia32")) { + platformArch = "x86_64-windows"; + } else { + throw new Error(`Platform and architecture unsupported: ${process.platform}/${process.arch}`); + } + const url = `https://github.com/bytecodealliance/javy/releases/download/${version}/javy-${platformArch}-${version}.gz`; + const response = await fetch(url); + if (!response.ok) { + throw new Error(`Error downloading Javy from ${url}: ${response.status}: ${response.statusText}`); + } + const gunzip = gzip.createGunzip(); + const output = fs.createWriteStream(javyPath); + await new Promise((resolve, reject) => { + stream.pipeline(response.body, gunzip, output, (err, val) => { + if (err) return reject(err); + return resolve(val); + }); + }); + await fs.promises.chmod(javyPath, 0o775); +}