@neon-rs/cli 0.0.2 → 0.0.3

package/dist/commands/pack-build.js

@@ -22,11 +22,11 @@ function lookup(target) {
 }
 export default class PackBuild {
     static summary() { return 'Create an npm tarball from a prebuild.'; }
-    static syntax() { return 'neon pack-build [-f <addon>] <target>'; }
+    static syntax() { return 'neon pack-build [-f <addon>] [-t <target>]'; }
     static options() {
         return [
             { name: '-f, --file <addon>', summary: 'Prebuilt .node file to pack. (Default: index.node)' },
-            { name: '<target>', summary: 'Rust target triple the addon was built for.' }
+            { name: '-t, --target <target>', summary: 'Rust target triple the addon was built for. (Default: rustc default host)' }
         ];
     }
     static seeAlso() {
@@ -37,28 +37,33 @@ export default class PackBuild {
         ];
     }
     constructor(argv) {
-        const options = commandLineArgs(OPTIONS, { argv, stopAtFirstUnknown: true });
-        argv = options._unknown || [];
-        if (argv.length === 0) {
-            throw new Error("Expected <target>.");
-        }
-        if (argv.length > 1) {
-            throw new Error(`Unexpected argument \`${argv[1]}\`.`);
-        }
-        this._target = argv[0];
+        const options = commandLineArgs(OPTIONS, { argv });
+        this._target = options.target || null;
         this._addon = options.file;
         this._outDir = options['out-dir'] || path.join(process.cwd(), 'dist');
     }
+    async currentTarget() {
+        const result = await execa("rustc", ["-vV"], { shell: true });
+        if (result.exitCode !== 0) {
+            throw new Error(`Could not determine current Rust target: ${result.stderr}`);
+        }
+        const hostLine = result.stdout.split(/\n/).find(line => line.startsWith('host:'));
+        if (!hostLine) {
+            throw new Error("Could not determine current Rust target (unexpected rustc output)");
+        }
+        return hostLine.replace(/^host:\s+/, '');
+    }
     async run() {
         await fs.mkdir(this._outDir, { recursive: true });
         const manifest = JSON.parse(await fs.readFile('package.json', { encoding: 'utf8' }));
         const version = manifest.version;
         const targets = manifest.neon.targets;
-        const name = targets[this._target];
+        const target = this._target || await this.currentTarget();
+        const name = targets[target];
         if (!name) {
-            throw new Error(`Rust target ${this._target} not found in package.json.`);
+            throw new Error(`Rust target ${target} not found in package.json.`);
         }
-        const targetInfo = lookup(this._target);
+        const targetInfo = lookup(target);
         const description = `Prebuilt binary package for \`${manifest.name}\` on \`${targetInfo.node}\`.`;
         let prebuildManifest = {
             name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-rs/cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Command-line build tool for Neon modules.",
   "type": "module",
   "exports": "./dist/index.js",

package/types/commands/pack-build.d.ts

@@ -8,5 +8,6 @@ export default class PackBuild implements Command {
     private _addon;
     private _outDir;
     constructor(argv: string[]);
+    currentTarget(): Promise<string>;
     run(): Promise<void>;
 }