@neon-rs/cli 0.0.26 → 0.0.28

package/index.js

@@ -10099,6 +10099,126 @@ function wrappy (fn, cb) {
 }
 
 
+/***/ }),
+
+/***/ 1401:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.custom = exports.scope = exports.debug = exports.currentTarget = void 0;
+const path = __importStar(__nccwpck_require__(1017));
+const fs = __importStar(__nccwpck_require__(7147));
+function currentTarget() {
+    let os = null;
+    switch (process.platform) {
+        case 'android':
+            switch (process.arch) {
+                case 'arm':
+                    return 'android-arm-eabi';
+                case 'arm64':
+                    return 'android-arm64';
+            }
+            os = 'Android';
+            break;
+        case 'win32':
+            switch (process.arch) {
+                case 'x64':
+                    return 'win32-x64-msvc';
+                case 'arm64':
+                    return 'win32-arm64-msvc';
+                case 'ia32':
+                    return 'win32-ia32-msvc';
+            }
+            os = 'Windows';
+            break;
+        case 'darwin':
+            switch (process.arch) {
+                case 'x64':
+                    return 'darwin-x64';
+                case 'arm64':
+                    return 'darwin-arm64';
+            }
+            os = 'macOS';
+            break;
+        case 'linux':
+            switch (process.arch) {
+                case 'x64':
+                case 'arm64':
+                    return isGlibc()
+                        ? `linux-${process.arch}-gnu`
+                        : `linux-${process.arch}-musl`;
+                case 'arm':
+                    return 'linux-arm-gnueabihf';
+            }
+            os = 'Linux';
+            break;
+        case 'freebsd':
+            if (process.arch === 'x64') {
+                return 'freebsd-x64';
+            }
+            os = 'FreeBSD';
+            break;
+    }
+    if (os) {
+        throw new Error(`Neon: unsupported ${os} architecture: ${process.arch}`);
+    }
+    throw new Error(`Neon: unsupported system: ${process.platform}`);
+}
+exports.currentTarget = currentTarget;
+function isGlibc() {
+    // Cast to unknown to work around a bug in the type definition:
+    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/40140
+    const report = process.report?.getReport();
+    if ((typeof report !== 'object') || !report || (!('header' in report))) {
+        return false;
+    }
+    const header = report.header;
+    return (typeof header === 'object') &&
+        !!header &&
+        ('glibcVersionRuntime' in header);
+}
+function debug(...components) {
+    if (components.length === 0 || !components[components.length - 1].endsWith(".node")) {
+        components.push("index.node");
+    }
+    const pathSpec = path.join(...components);
+    return fs.existsSync(pathSpec) ? require(pathSpec) : null;
+}
+exports.debug = debug;
+function scope(scope) {
+    return require(scope + "/" + currentTarget());
+}
+exports.scope = scope;
+function custom(toRequireSpec) {
+    return require(toRequireSpec(currentTarget()));
+}
+exports.custom = custom;
+
+
 /***/ }),
 
 /***/ 9491:
@@ -10176,6 +10296,62 @@ module.exports = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("tty");
 
 module.exports = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("util");
 
+/***/ }),
+
+/***/ 430:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const load = __nccwpck_require__(1401);
+
+const {
+  fromStdin,
+  fromFile,
+  findArtifact,
+  findFileByCrateType
+} = load.debug(__dirname, '..') || load.scope("@cargo-messages");
+
+const PRIVATE = {};
+
+function enforcePrivate(nonce, className) {
+  if (nonce !== PRIVATE) {
+    throw new Error(`${className} constructor is private`);
+  }
+}
+
+class CargoArtifact {
+  constructor(nonce, kernel) {
+    enforcePrivate(nonce, 'CargoArtifact');
+    this._kernel = kernel;
+  }
+
+  findFileByCrateType(crateType) {
+    return findFileByCrateType(this._kernel, crateType);
+  }
+}
+
+class CargoMessages {
+  constructor(options) {
+    options = options || {};
+    this._mount = options.mount || null;
+    this._manifestPath = options.manifestPath || null;
+    this._kernel = options.file
+      ? fromFile(options.file, this._mount, this._manifestPath)
+      : fromStdin(this._mount, this._manifestPath);
+  }
+
+  findArtifact(crateName) {
+    const found = findArtifact(this._kernel, crateName);
+    return found
+      ? new CargoArtifact(PRIVATE, found)
+      : null;
+  }
+}
+
+module.exports = {
+  CargoMessages
+};
+
+
 /***/ })
 
 /******/ });
@@ -13232,12 +13408,96 @@ const promises_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.ur
 // EXTERNAL MODULE: ../../node_modules/command-line-args/dist/index.js
 var dist = __nccwpck_require__(4516);
 var dist_default = /*#__PURE__*/__nccwpck_require__.n(dist);
-;// CONCATENATED MODULE: external "node:fs"
-const external_node_fs_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs");
+// EXTERNAL MODULE: ./node_modules/cargo-messages/cjs/index.cjs
+var cjs = __nccwpck_require__(430);
+;// CONCATENATED MODULE: ./node_modules/cargo-messages/esm/index.js
+
+
+
+
+;// CONCATENATED MODULE: ./src/commands/dist.ts
+
+
+
+// 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' }
+];
+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>' }
+        ];
+    }
+    _log;
+    _file;
+    _mount;
+    _manifestPath;
+    _crateName;
+    _out;
+    constructor(argv) {
+        const options = dist_default()(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;
+    }
+    findArtifact() {
+        const messages = new cjs.CargoMessages({
+            mount: this._mount || undefined,
+            manifestPath: this._manifestPath || undefined,
+            file: this._log || undefined
+        });
+        return messages.findArtifact(this._crateName)?.findFileByCrateType('cdylib') || null;
+    }
+    async run() {
+        const file = this._file || 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 (0,promises_namespaceObject.copyFile)(file, this._out);
+    }
+}
+
 ;// CONCATENATED MODULE: external "node:path"
 const external_node_path_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:path");
-;// CONCATENATED MODULE: external "node:readline"
-const external_node_readline_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:readline");
+// EXTERNAL MODULE: ../../node_modules/temp/lib/temp.js
+var temp = __nccwpck_require__(5758);
 ;// CONCATENATED MODULE: external "node:buffer"
 const external_node_buffer_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:buffer");
 ;// CONCATENATED MODULE: external "node:child_process"
@@ -14073,6 +14333,8 @@ const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
 	});
 };
 
+;// CONCATENATED MODULE: external "node:fs"
+const external_node_fs_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs");
 ;// CONCATENATED MODULE: ../../node_modules/is-stream/index.js
 function isStream(stream) {
 	return stream !== null
@@ -14767,250 +15029,6 @@ function execaNode(scriptPath, args, options = {}) {
 	);
 }
 
-;// CONCATENATED MODULE: ./src/cargo.ts
-
-
-
-
-function messageReason(message) {
-    return message.reason;
-}
-function isCompilerMessage(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('reason' in json) || (json.reason !== 'compiler-message')) {
-        return false;
-    }
-    return true;
-}
-function isBuildScriptExecuted(json) {
-    if (!(json instanceof Object)) {
-        return false;
-    }
-    if (!('reason' in json) || (json.reason !== 'build-script-executed')) {
-        return false;
-    }
-    return true;
-}
-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;
-}
-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;
-}
-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');
-}
-function parseMessage(line) {
-    try {
-        const json = JSON.parse(line);
-        if (isCompilerMessage(json) ||
-            isBuildScriptExecuted(json) ||
-            isCompilerArtifact(json) ||
-            isBuildFinished(json)) {
-            return json;
-        }
-    }
-    catch (nope) { }
-    return null;
-}
-class MessageStream {
-    _stream;
-    constructor(file) {
-        const input = file ? (0,external_node_fs_namespaceObject.createReadStream)(file) : process.stdin;
-        this._stream = external_node_readline_namespaceObject.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();
-        }
-    }
-}
-class UnmountMessageStream extends MessageStream {
-    _mount;
-    _manifestPath;
-    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 = external_node_path_namespaceObject.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 = external_node_path_namespaceObject.join(cargoMetadata.target_directory, relPath);
-        return absPath;
-    }
-}
-
-;// CONCATENATED MODULE: ./src/commands/dist.ts
-
-
-
-// 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' }
-];
-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>' }
-        ];
-    }
-    _log;
-    _file;
-    _mount;
-    _manifestPath;
-    _crateName;
-    _out;
-    constructor(argv) {
-        const options = dist_default()(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 (0,promises_namespaceObject.copyFile)(file, this._out);
-    }
-}
-
-// EXTERNAL MODULE: ../../node_modules/temp/lib/temp.js
-var temp = __nccwpck_require__(5758);
 ;// CONCATENATED MODULE: ./data/rust.json
 const rust_namespaceObject = JSON.parse('{"aarch64-apple-darwin":"darwin-arm64","x86_64-apple-darwin":"darwin-x64","aarch64-apple-ios":"ios-arm64","x86_64-apple-ios":"ios-x64","aarch64-linux-android":"android-arm64","armv7-linux-androideabi":"android-arm-eabi","i686-linux-android":"android-ia32","x86_64-linux-android":"android-x64","aarch64-pc-windows-msvc":"win32-arm64-msvc","i686-pc-windows-gnu":"win32-ia32-gnu","i686-pc-windows-msvc":"win32-ia32-msvc","x86_64-pc-windows-gnu":"win32-x64-gnu","x86_64-pc-windows-msvc":"win32-x64-msvc","aarch64-unknown-linux-gnu":"linux-arm64-gnu","aarch64-unknown-linux-musl":"linux-arm64-musl","arm-unknown-linux-gnueabihf":"linux-arm-gnueabihf","arm-unknown-linux-musleabihf":"linux-arm-musleabihf","armv7-unknown-linux-gnueabihf":"linux-arm-gnueabihf","armv7-unknown-linux-musleabihf":"linux-arm-musleabihf","i686-unknown-linux-gnu":"linux-ia32-gnu","i686-unknown-linux-musl":"linux-ia32-musl","mips-unknown-linux-gnu":"linux-mips-gnu","mips-unknown-linux-musl":"linux-mips-musl","mips64-unknown-linux-gnuabi64":"linux-mips64-gnuabi64","mips64-unknown-linux-muslabi64":"linux-mips64-muslabi64","mips64el-unknown-linux-gnuabi64":"linux-mips64el-gnuabi64","mips64el-unknown-linux-muslabi64":"linux-mips64el-muslabi64","mipsel-unknown-linux-gnu":"linux-mipsel-gnu","mipsel-unknown-linux-musl":"linux-mipsel-musl","powerpc-unknown-linux-gnu":"linux-powerpc-gnu","powerpc64-unknown-linux-gnu":"linux-powerpc64-gnu","powerpc64le-unknown-linux-gnu":"linux-powerpc64le-gnu","riscv64gc-unknown-linux-gnu":"linux-riscv64gc-gnu","s390x-unknown-linux-gnu":"linux-s390x-gnu","sparc64-unknown-linux-gnu":"linux-sparc64-gnu","x86_64-unknown-linux-gnu":"linux-x64-gnu","x86_64-unknown-linux-gnux32":"linux-x64-gnux32","x86_64-unknown-linux-musl":"linux-x64-musl","i686-unknown-freebsd":"freebsd-ia32","x86_64-unknown-freebsd":"freebsd-x64"}');
 ;// CONCATENATED MODULE: ./data/node.json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-rs/cli",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "Command-line build tool for Neon modules.",
   "type": "module",
   "exports": "./index.js",
@@ -26,5 +26,13 @@
     "url": "https://github.com/dherman/neon-rs/issues"
   },
   "homepage": "https://github.com/dherman/neon-rs#readme",
-  "neon": null
+  "optionalDependences": {
+    "@cargo-messages/win32-x64-msvc": "0.0.26",
+    "@cargo-messages/win32-arm64-msvc": "0.0.26",
+    "@cargo-messages/darwin-x64": "0.0.26",
+    "@cargo-messages/darwin-arm64": "0.0.26",
+    "@cargo-messages/linux-x64-gnu": "0.0.26",
+    "@cargo-messages/linux-arm-gnueabihf": "0.0.26",
+    "@cargo-messages/android-arm-eabi": "0.0.26"
+  }
 }