@neon-rs/cli 0.0.3 → 0.0.5

package/package.json

@@ -1,25 +1,17 @@
 {
   "name": "@neon-rs/cli",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Command-line build tool for Neon modules.",
   "type": "module",
-  "exports": "./dist/index.js",
-  "types": "types/index.d.ts",
+  "exports": "./index.js",
   "files": [
-    "data/**/*",
-    "dist/**/*",
-    "types/**/*",
-    "LICENSE*"
+    "LICENSE*",
+    "index.js"
   ],
   "bin": {
-    "neon": "dist/index.js"
-  },
-  "scripts": {
-    "build": "tsc",
-    "pretest": "npm run build",
-    "prepack": "npm run build",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "neon": "./index.js"
   },
+  "author": "Dave Herman <david.herman@gmail.com>",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dherman/neon-rs.git"
@@ -29,28 +21,10 @@
     "Rust",
     "Node"
   ],
-  "author": "Dave Herman <david.herman@gmail.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/dherman/neon-rs/issues"
   },
   "homepage": "https://github.com/dherman/neon-rs#readme",
-  "devDependencies": {
-    "@tsconfig/node16": "^1.0.3",
-    "@types/command-line-args": "^5.2.0",
-    "@types/command-line-commands": "^2.0.1",
-    "@types/command-line-usage": "^5.0.2",
-    "@types/node": "^18.15.11",
-    "@types/temp": "^0.9.1",
-    "typescript": "^5.0.4"
-  },
-  "dependencies": {
-    "chalk": "^5.2.0",
-    "command-line-args": "^5.2.1",
-    "command-line-commands": "^3.0.2",
-    "command-line-usage": "^7.0.1",
-    "execa": "^7.1.1",
-    "stream-to-string": "^1.2.1",
-    "temp": "^0.9.4"
-  }
+  "neon": null
 }

package/data/llvm.json

@@ -1,42 +0,0 @@
-{
-  "aarch64-apple-darwin": ["darwin", "arm64", 0],
-  "x86_64-apple-darwin": ["darwin", "x64", 0],
-  "aarch64-apple-ios": ["ios", "arm64", 0],
-  "x86_64-apple-ios": ["ios", "x64", 0],
-  "aarch64-linux-android": ["android", "arm64", 0],
-  "armv7-linux-androideabi": ["android", "arm", 0],
-  "i686-linux-android": ["android", "ia32", 0],
-  "x86_64-linux-android": ["android", "x64", 0],
-  "aarch64-pc-windows-msvc": ["win32", "arm64", 0],
-  "i686-pc-windows-gnu": ["win32", "ia32", 0],
-  "i686-pc-windows-msvc": ["win32", "ia32", 1],
-  "x86_64-pc-windows-gnu": ["win32", "x64", 0],
-  "x86_64-pc-windows-msvc": ["win32", "x64", 1],
-  "aarch64-unknown-linux-gnu": ["linux", "arm64", 0],
-  "aarch64-unknown-linux-musl": ["linux", "arm64", 1],
-  "arm-unknown-linux-gnueabihf": ["linux", "arm", 0],
-  "arm-unknown-linux-musleabihf": ["linux", "arm", 1],
-  "armv7-unknown-linux-gnueabihf": ["linux", "arm", 2],
-  "armv7-unknown-linux-musleabihf": ["linux", "arm", 3],
-  "i686-unknown-linux-gnu": ["linux", "ia32", 0],
-  "i686-unknown-linux-musl": ["linux", "ia32", 1],
-  "mips-unknown-linux-gnu": ["linux", "mips", 0],
-  "mips-unknown-linux-musl": ["linux", "mips", 1],
-  "mips64-unknown-linux-gnuabi64": ["linux", "mips64", 0],
-  "mips64-unknown-linux-muslabi64": ["linux", "mips64", 1],
-  "mips64el-unknown-linux-gnuabi64": ["linux", "mips64el", 0],
-  "mips64el-unknown-linux-muslabi64": ["linux", "mips64el", 1],
-  "mipsel-unknown-linux-gnu": ["linux", "mipsel", 0],
-  "mipsel-unknown-linux-musl": ["linux", "mipsel", 1],
-  "powerpc-unknown-linux-gnu": ["linux", "powerpc", 0],
-  "powerpc64-unknown-linux-gnu": ["linux", "powerpc64", 0],
-  "powerpc64le-unknown-linux-gnu": ["linux", "powerpc64le", 0],
-  "riscv64gc-unknown-linux-gnu": ["linux", "riscv64gc", 0],
-  "s390x-unknown-linux-gnu": ["linux", "s390x", 0],
-  "sparc64-unknown-linux-gnu": ["linux", "sparc64", 0],
-  "x86_64-unknown-linux-gnu": ["linux", "x64", 0],
-  "x86_64-unknown-linux-gnux32": ["linux", "x64", 1],
-  "x86_64-unknown-linux-musl": ["linux", "x64", 2],
-  "i686-unknown-freebsd": ["freebsd", "ia32", 0],
-  "x86_64-unknown-freebsd": ["freebsd", "x64", 0]
-}

package/data/node.json

@@ -1,281 +0,0 @@
-{
-  "darwin": {
-    "arm64": [{
-      "platform": "darwin",
-      "arch": "arm64",
-      "abi": null,
-      "node": "darwin-arm64",
-      "llvm": "aarch64-apple-darwin"
-    }],
-    "x64": [{
-      "platform": "darwin",
-      "arch": "x64",
-      "abi": null,
-      "node": "darwin-x64",
-      "llvm": "x86_64-apple-darwin"
-    }]
-  },
-  "ios": {
-    "arm64": [{
-      "platform": "ios",
-      "arch": "arm64",
-      "abi": null,
-      "node": "ios-arm64",
-      "llvm": "aarch64-apple-ios"
-    }],
-    "x64": [{
-      "platform": "ios",
-      "arch": "x64",
-      "abi": null,
-      "node": "ios-x64",
-      "llvm": "x86_64-apple-ios"
-    }]
-  },
-  "android": {
-    "arm64": [{
-      "platform": "android",
-      "arch": "arm64",
-      "abi": null,
-      "node": "android-arm64",
-      "llvm": "aarch64-linux-android"
-    }],
-    "arm": [{
-      "platform": "android",
-      "arch": "arm",
-      "abi": "eabi",
-      "node": "android-arm-eabi",
-      "llvm": "armv7-linux-androideabi"
-    }],
-    "ia32": [{
-      "platform": "android",
-      "arch": "ia32",
-      "abi": null,
-      "node": "android-ia32",
-      "llvm": "i686-linux-android"
-    }],
-    "x64": [{
-      "platform": "android",
-      "arch": "x64",
-      "abi": null,
-      "node": "android-x64",
-      "llvm": "x86_64-linux-android"
-    }]
-  },
-  "win32": {
-    "arm64": [{
-      "platform": "win32",
-      "arch": "arm64",
-      "abi": "msvc",
-      "node": "win32-arm64-msvc",
-      "llvm": "aarch64-pc-windows-msvc"
-    }],
-    "ia32": [{
-      "platform": "win32",
-      "arch": "ia32",
-      "abi": "gnu",
-      "node": "win32-ia32-gnu",
-      "llvm": "i686-pc-windows-gnu"
-    }, {
-      "platform": "win32",
-      "arch": "ia32",
-      "abi": "msvc",
-      "node": "win32-ia32-msvc",
-      "llvm": "i686-pc-windows-msvc"
-    }],
-    "x64": [{
-      "platform": "win32",
-      "arch": "x64",
-      "abi": "gnu",
-      "node": "win32-x64-gnu",
-      "llvm": "x86_64-pc-windows-gnu"
-    }, {
-      "platform": "win32",
-      "arch": "x64",
-      "abi": "msvc",
-      "node": "win32-x64-msvc",
-      "llvm": "x86_64-pc-windows-msvc"
-    }]
-  },
-  "linux": {
-    "arm64": [{
-      "platform": "linux",
-      "arch": "arm64",
-      "abi": "gnu",
-      "node": "linux-arm64-gnu",
-      "llvm": "aarch64-unknown-linux-gnu"
-    }, {
-      "platform": "linux",
-      "arch": "arm64",
-      "abi": "musl",
-      "node": "linux-arm64-musl",
-      "llvm": "aarch64-unknown-linux-musl"
-    }],
-    "arm": [{
-      "platform": "linux",
-      "arch": "arm",
-      "abi": "gnueabihf",
-      "node": "linux-arm-gnueabihf",
-      "llvm": "arm-unknown-linux-gnueabihf"
-    }, {
-      "platform": "linux",
-      "arch": "arm",
-      "abi": "musleabihf",
-      "node": "linux-arm-musleabihf",
-      "llvm": "arm-unknown-linux-musleabihf"
-    }, {
-      "platform": "linux",
-      "arch": "arm",
-      "abi": "gnueabihf",
-      "node": "linux-arm-gnueabihf",
-      "llvm": "armv7-unknown-linux-gnueabihf"
-    }, {
-      "platform": "linux",
-      "arch": "arm",
-      "abi": "musleabihf",
-      "node": "linux-arm-musleabihf",
-      "llvm": "armv7-unknown-linux-musleabihf"
-    }],
-    "ia32": [{
-      "platform": "linux",
-      "arch": "ia32",
-      "abi": "gnu",
-      "node": "linux-ia32-gnu",
-      "llvm": "i686-unknown-linux-gnu"
-    }, {
-      "platform": "linux",
-      "arch": "ia32",
-      "abi": "musl",
-      "node": "linux-ia32-musl",
-      "llvm": "i686-unknown-linux-musl"
-    }],
-    "mips": [{
-      "platform": "linux",
-      "arch": "mips",
-      "abi": "gnu",
-      "node": "linux-mips-gnu",
-      "llvm": "mips-unknown-linux-gnu"
-    }, {
-      "platform": "linux",
-      "arch": "mips",
-      "abi": "musl",
-      "node": "linux-mips-musl",
-      "llvm": "mips-unknown-linux-musl"
-    }],
-    "mips64": [{
-      "platform": "linux",
-      "arch": "mips64",
-      "abi": "gnuabi64",
-      "node": "linux-mips64-gnuabi64",
-      "llvm": "mips64-unknown-linux-gnuabi64"
-    }, {
-      "platform": "linux",
-      "arch": "mips64",
-      "abi": "muslabi64",
-      "node": "linux-mips64-muslabi64",
-      "llvm": "mips64-unknown-linux-muslabi64"
-    }],
-    "mips64el": [{
-      "platform": "linux",
-      "arch": "mips64el",
-      "abi": "gnuabi64",
-      "node": "linux-mips64el-gnuabi64",
-      "llvm": "mips64el-unknown-linux-gnuabi64"
-    }, {
-      "platform": "linux",
-      "arch": "mips64el",
-      "abi": "muslabi64",
-      "node": "linux-mips64el-muslabi64",
-      "llvm": "mips64el-unknown-linux-muslabi64"
-    }],
-    "mipsel": [{
-      "platform": "linux",
-      "arch": "mipsel",
-      "abi": "gnu",
-      "node": "linux-mipsel-gnu",
-      "llvm": "mipsel-unknown-linux-gnu"
-    }, {
-      "platform": "linux",
-      "arch": "mipsel",
-      "abi": "musl",
-      "node": "linux-mipsel-musl",
-      "llvm": "mipsel-unknown-linux-musl"
-    }],
-    "powerpc": [{
-      "platform": "linux",
-      "arch": "powerpc",
-      "abi": "gnu",
-      "node": "linux-powerpc-gnu",
-      "llvm": "powerpc-unknown-linux-gnu"
-    }],
-    "powerpc64": [{
-      "platform": "linux",
-      "arch": "powerpc64",
-      "abi": "gnu",
-      "node": "linux-powerpc64-gnu",
-      "llvm": "powerpc64-unknown-linux-gnu"
-    }],
-    "powerpc64le": [{
-      "platform": "linux",
-      "arch": "powerpc64le",
-      "abi": "gnu",
-      "node": "linux-powerpc64le-gnu",
-      "llvm": "powerpc64le-unknown-linux-gnu"
-    }],
-    "riscv64gc": [{
-      "platform": "linux",
-      "arch": "riscv64gc",
-      "abi": "gnu",
-      "node": "linux-riscv64gc-gnu",
-      "llvm": "riscv64gc-unknown-linux-gnu"
-    }],
-    "s390x": [{
-      "platform": "linux",
-      "arch": "s390x",
-      "abi": "gnu",
-      "node": "linux-s390x-gnu",
-      "llvm": "s390x-unknown-linux-gnu"
-    }],
-    "sparc64": [{
-      "platform": "linux",
-      "arch": "sparc64",
-      "abi": "gnu",
-      "node": "linux-sparc64-gnu",
-      "llvm": "sparc64-unknown-linux-gnu"
-    }],
-    "x64": [{
-      "platform": "linux",
-      "arch": "x64",
-      "abi": "gnu",
-      "node": "linux-x64-gnu",
-      "llvm": "x86_64-unknown-linux-gnu"
-    }, {
-      "platform": "linux",
-      "arch": "x64",
-      "abi": "gnux32",
-      "node": "linux-x64-gnux32",
-      "llvm": "x86_64-unknown-linux-gnux32"
-    }, {
-      "platform": "linux",
-      "arch": "x64",
-      "abi": "musl",
-      "node": "linux-x64-musl",
-      "llvm": "x86_64-unknown-linux-musl"
-    }]
-  },
-  "freebsd": {
-    "ia32": [{
-      "platform": "freebsd",
-      "arch": "ia32",
-      "abi": null,
-      "node": "freebsd-ia32",
-      "llvm": "i686-unknown-freebsd"
-    }],
-    "x64": [{
-      "platform": "freebsd",
-      "arch": "x64",
-      "abi": null,
-      "node": "freebsd-x64",
-      "llvm": "x86_64-unknown-freebsd"
-    }]
-  }
-}

package/dist/cargo.js

@@ -1,154 +0,0 @@
-import { createReadStream } from 'node:fs';
-import * as path from 'node:path';
-import * as readline from 'node:readline';
-import { execa } from 'execa';
-export function messageReason(message) {
-    return message.reason;
-}
-export function isCompilerMessage(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('reason' in json) || (json.reason !== 'compiler-message')) {
-        return false;
-    }
-    return true;
-}
-export function isBuildScriptExecuted(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('reason' in json) || (json.reason !== 'build-script-executed')) {
-        return false;
-    }
-    return true;
-}
-export function isCompilerTarget(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('kind' in json) || !isStringArray(json.kind)) {
-        return false;
-    }
-    if (!('crate_types' in json) || !isStringArray(json.crate_types)) {
-        return false;
-    }
-    if (!('name' in json) || (typeof json.name !== 'string')) {
-        return false;
-    }
-    return true;
-}
-export function isCompilerArtifact(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('reason' in json) || (json.reason !== 'compiler-artifact')) {
-        return false;
-    }
-    if (!('package_id' in json) || (typeof json.package_id !== 'string')) {
-        return false;
-    }
-    if (!('manifest_path' in json) || (typeof json.manifest_path !== 'string')) {
-        return false;
-    }
-    if (!('target' in json) || !isCompilerTarget(json.target)) {
-        return false;
-    }
-    if (!('filenames' in json) || !isStringArray(json.filenames)) {
-        return false;
-    }
-    return true;
-}
-function isStringArray(json) {
-    if (!Array.isArray(json)) {
-        return false;
-    }
-    for (const val of json) {
-        if (typeof val !== 'string') {
-            return false;
-        }
-    }
-    return true;
-}
-export function isBuildFinished(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('reason' in json) || (json.reason !== 'build-finished')) {
-        return false;
-    }
-    return ('success' in json) && (typeof json.success === 'boolean');
-}
-export function parseMessage(line) {
-    try {
-        const json = JSON.parse(line);
-        if (isCompilerMessage(json) ||
-            isBuildScriptExecuted(json) ||
-            isCompilerArtifact(json) ||
-            isBuildFinished(json)) {
-            return json;
-        }
-    }
-    catch (nope) { }
-    return null;
-}
-export class MessageStream {
-    constructor(file) {
-        const input = file ? createReadStream(file) : process.stdin;
-        this._stream = readline.createInterface({
-            input,
-            terminal: false
-        });
-    }
-    async findPath(pred) {
-        try {
-            for await (const line of this._stream) {
-                const msg = parseMessage(line);
-                if (!msg) {
-                    continue;
-                }
-                const result = pred(msg);
-                if (result !== null) {
-                    return result;
-                }
-            }
-            return null;
-        }
-        finally {
-            this._stream.close();
-        }
-    }
-}
-export class UnmountMessageStream extends MessageStream {
-    constructor(mount, manifestPath, file) {
-        super(file);
-        this._mount = mount;
-        this._manifestPath = manifestPath;
-    }
-    async findPath(pred) {
-        // The base class's version reports paths as absolute paths from within
-        // a mount in a virtual filesystem.
-        const mountedPath = await super.findPath(pred);
-        if (!mountedPath) {
-            return null;
-        }
-        // The path relative to the workspace's target directory.
-        const relPath = path.relative(this._mount, mountedPath);
-        // Now find the true absolute path of the target directory on the host system.
-        const cargo = await execa('cargo', [
-            'metadata',
-            '--format-version=1',
-            '--no-deps',
-            ...(this._manifestPath ? ['--manifest-path', this._manifestPath] : [])
-        ], {
-            shell: true
-        });
-        if (cargo.exitCode !== 0) {
-            throw new Error(`Invoking \`cargo metadata\` failed: ${cargo.stderr}`);
-        }
-        const cargoMetadata = JSON.parse(cargo.stdout);
-        // Finally, re-parent the relative path into an absolute path on the host system.
-        const absPath = path.join(cargoMetadata.target_directory, relPath);
-        return absPath;
-    }
-}

package/dist/command.js

@@ -1,39 +0,0 @@
-import Dist from './commands/dist.js';
-import PackBuild from './commands/pack-build.js';
-import InstallBuilds from './commands/install-builds.js';
-import Help from './commands/help.js';
-export var CommandName;
-(function (CommandName) {
-    CommandName["Help"] = "help";
-    CommandName["Dist"] = "dist";
-    CommandName["PackBuild"] = "pack-build";
-    CommandName["InstallBuilds"] = "install-builds";
-})(CommandName = CommandName || (CommandName = {}));
-;
-export function isCommandName(s) {
-    const keys = Object.values(CommandName);
-    return keys.includes(s);
-}
-export function asCommandName(name) {
-    if (!isCommandName(name)) {
-        throw new RangeError(`Command not recognized: ${name}`);
-    }
-    return name;
-}
-const COMMANDS = {
-    [CommandName.Help]: Help,
-    [CommandName.Dist]: Dist,
-    [CommandName.PackBuild]: PackBuild,
-    [CommandName.InstallBuilds]: InstallBuilds
-};
-export function commandFor(name) {
-    return COMMANDS[name];
-}
-export function summaries() {
-    return [
-        { name: CommandName.Help, summary: Help.summary() },
-        { name: CommandName.Dist, summary: Dist.summary() },
-        { name: CommandName.PackBuild, summary: PackBuild.summary() },
-        { name: CommandName.InstallBuilds, summary: InstallBuilds.summary() }
-    ];
-}

package/dist/commands/dist.js

@@ -1,75 +0,0 @@
-import { copyFile } from 'node:fs/promises';
-import commandLineArgs from 'command-line-args';
-import { MessageStream, UnmountMessageStream, isCompilerArtifact } from '../cargo.js';
-// FIXME: add options to infer crate name from manifests
-// --package <path/to/package.json>
-// --crate <path/to/Cargo.toml>
-const OPTIONS = [
-    { name: 'name', alias: 'n', type: String, defaultValue: null },
-    { name: 'file', alias: 'f', type: String, defaultValue: null },
-    { name: 'log', alias: 'l', type: String, defaultValue: null },
-    { name: 'mount', alias: 'm', type: String, defaultValue: null },
-    { name: 'manifest-path', type: String, defaultValue: null },
-    { name: 'out', alias: 'o', type: String, defaultValue: 'index.node' }
-];
-export default class Dist {
-    static summary() { return 'Generate a .node file from a build.'; }
-    static syntax() { return 'neon dist [-n <name>] [-f <dylib>|[-l <log>] [-m <path>]] [-o <dist>]'; }
-    static options() {
-        return [
-            { name: '-n, --name', summary: 'Crate name. (Default: $npm_package_name)' },
-            { name: '-f, --file <dylib>', summary: 'Build .node from dylib file <dylib>.' },
-            { name: '-l, --log <log>', summary: 'Find dylib path from cargo messages <log>. (Default: stdin)' },
-            {
-                name: '-m, --mount <path>',
-                summary: 'Mounted path of target directory in virtual filesystem. This is used to map paths from the log data back to their real paths, needed when tools such as cross-rs report messages from within a mounted Docker filesystem.'
-            },
-            { name: '--manifest-path <path>', summary: 'Real path to Cargo.toml. (Default: cargo behavior)' },
-            { name: '-o, --out <dist>', summary: 'Copy output to file <dist>. (Default: index.node)' }
-        ];
-    }
-    static seeAlso() {
-        return [
-            { name: 'cargo messages', summary: '<https://doc.rust-lang.org/cargo/reference/external-tools.html>' },
-            { name: 'cross-rs', summary: '<https://github.com/cross-rs/cross>' }
-        ];
-    }
-    constructor(argv) {
-        const options = commandLineArgs(OPTIONS, { argv });
-        if (options.log && options.file) {
-            throw new Error("Options --log and --file cannot both be enabled.");
-        }
-        if (options.file && options.mount) {
-            throw new Error("Options --mount and --file cannot both be enabled.");
-        }
-        if (options['manifest-path'] && !options.mount) {
-            throw new Error("Option --manifest-path requires option --mount to be provided.");
-        }
-        this._log = options.log ?? null;
-        this._file = options.file ?? null;
-        this._mount = options.mount;
-        this._manifestPath = options['manifest-path'];
-        this._crateName = options.name || process.env['npm_package_name'];
-        this._out = options.out;
-    }
-    async findArtifact() {
-        const stream = this._mount
-            ? new UnmountMessageStream(this._mount, this._manifestPath, this._log)
-            : new MessageStream(this._log);
-        return await stream.findPath((msg) => {
-            if (!isCompilerArtifact(msg) || (msg.target.name !== this._crateName)) {
-                return null;
-            }
-            const index = msg.target.crate_types.indexOf('cdylib');
-            return (index < 0) ? null : msg.filenames[index];
-        });
-    }
-    async run() {
-        const file = this._file || await this.findArtifact();
-        if (!file) {
-            throw new Error(`No library found for crate ${this._crateName}`);
-        }
-        // FIXME: needs all the logic of cargo-cp-artifact (timestamp check, M1 workaround, async, errors)
-        await copyFile(file, this._out);
-    }
-}

package/dist/commands/help.js

@@ -1,26 +0,0 @@
-import { printMainUsage, printCommandUsage } from '../print.js';
-import { asCommandName } from '../command.js';
-export default class Help {
-    static summary() { return 'Display help information about Neon.'; }
-    static syntax() { return 'neon help <command>'; }
-    static options() {
-        return [
-            { name: '<command>', summary: 'Command to display help information about.' }
-        ];
-    }
-    static seeAlso() { }
-    constructor(argv) {
-        this._name = argv.length > 0 ? asCommandName(argv[0]) : undefined;
-        if (argv.length > 1) {
-            throw new Error(`Unexpected argument: ${argv[1]}`);
-        }
-    }
-    async run() {
-        if (this._name) {
-            printCommandUsage(this._name);
-        }
-        else {
-            printMainUsage();
-        }
-    }
-}