@neon-rs/cli 0.0.77 → 0.0.79

package/index.js

@@ -15113,7 +15113,8 @@ const mktemp = temp.track().mkdir;
 const pack_build_OPTIONS = [
     { name: 'file', alias: 'f', type: String, defaultValue: 'index.node' },
     { name: 'target', alias: 't', type: String, defaultValue: null },
-    { name: 'out-dir', alias: 'd', type: String, defaultValue: null }
+    { name: 'in-dir', alias: 'i', type: String, defaultValue: null },
+    { name: 'out-dir', alias: 'o', type: String, defaultValue: null }
 ];
 
 function isRustTarget(x) {
@@ -15136,8 +15137,9 @@ class PackBuild {
     static options() {
         return [
             { name: '-f, --file <addon>', summary: 'Prebuilt .node file to pack. (Default: index.node)' },
-            { name: '-t, --target <target>', summary: 'Rust target triple the addon was built for. (Default: rustc default host)' },
-            { name: '-d, --out-dir <path>', summary: 'Output directory, recursively created if needed. (Default: ./dist)' }
+            { name: '-t, --target <target>', summary: 'Rust target triple the addon was built for. (Default: in-dir manifest target or else rustc default host)' },
+            { name: '-i, --in-dir <path>', summary: 'Input directory with package manifest, created automatically by default. (Default: temp dir)' },
+            { name: '-o, --out-dir <path>', summary: 'Output directory, recursively created if needed. (Default: ./dist)' }
         ];
     }
     static seeAlso() {
@@ -15149,11 +15151,13 @@ class PackBuild {
     }
     _target;
     _addon;
+    _inDir;
     _outDir;
     constructor(argv) {
         const options = dist_default()(pack_build_OPTIONS, { argv });
         this._target = options.target || null;
         this._addon = options.file;
+        this._inDir = options['in-dir'] || null;
         this._outDir = options['out-dir'] || external_node_path_namespaceObject.join(process.cwd(), 'dist');
     }
     async currentTarget() {
@@ -15167,9 +15171,7 @@ class PackBuild {
         }
         return hostLine.replace(/^host:\s+/, '');
     }
-    async run() {
-        await promises_namespaceObject.mkdir(this._outDir, { recursive: true });
-        const manifest = JSON.parse(await promises_namespaceObject.readFile('package.json', { encoding: 'utf8' }));
+    async createTempDir(manifest) {
         const version = manifest.version;
         const targets = manifest.neon.targets;
         const target = this._target || await this.currentTarget();
@@ -15189,7 +15191,16 @@ class PackBuild {
             os: [targetInfo.platform],
             cpu: [targetInfo.arch],
             main: "index.node",
-            files: ["index.node"]
+            files: ["index.node"],
+            neon: {
+                binary: {
+                    rust: target,
+                    node: targetInfo.node,
+                    platform: targetInfo.platform,
+                    arch: targetInfo.arch,
+                    abi: targetInfo.abi
+                }
+            }
         };
         const OPTIONAL_KEYS = [
             'author', 'repository', 'keywords', 'bugs', 'homepage', 'license', 'engines'
@@ -15203,9 +15214,45 @@ class PackBuild {
         await promises_namespaceObject.writeFile(external_node_path_namespaceObject.join(tmpdir, "package.json"), JSON.stringify(prebuildManifest, null, 2));
         await promises_namespaceObject.copyFile(this._addon, external_node_path_namespaceObject.join(tmpdir, "index.node"));
         await promises_namespaceObject.writeFile(external_node_path_namespaceObject.join(tmpdir, "README.md"), `# \`${name}\`\n\n${description}\n`);
+        return tmpdir;
+    }
+    async prepareInDir(manifest) {
+        if (!this._inDir) {
+            return await this.createTempDir(manifest);
+        }
+        const version = manifest.version;
+        const binaryManifest = JSON.parse(await promises_namespaceObject.readFile(external_node_path_namespaceObject.join(this._inDir, 'package.json'), { encoding: 'utf8' }));
+        const binaryTarget = binaryManifest.neon.binary.rust || null;
+        if (binaryTarget && this._target && (binaryTarget !== this._target)) {
+            throw new Error(`Specified target ${this._target} does not match target ${binaryTarget} in ${this._inDir}`);
+        }
+        const target = binaryTarget || this._target || await this.currentTarget();
+        if (!isRustTarget(target)) {
+            throw new Error(`Rust target ${target} not supported.`);
+        }
+        const descriptor = lookup(target);
+        binaryManifest.neon = binaryManifest.neon || {};
+        binaryManifest.neon.binary = {
+            rust: target,
+            node: descriptor.node,
+            platform: descriptor.platform,
+            arch: descriptor.arch,
+            abi: descriptor.abi
+        };
+        // FIXME: make it possible to disable this
+        binaryManifest.version = version;
+        await promises_namespaceObject.writeFile(external_node_path_namespaceObject.join(this._inDir, 'package.json'), JSON.stringify(binaryManifest, null, 2), { encoding: 'utf8' });
+        // FIXME: make this path configurable
+        await promises_namespaceObject.copyFile(this._addon, external_node_path_namespaceObject.join(this._inDir, "index.node"));
+        return this._inDir;
+    }
+    async run() {
+        await promises_namespaceObject.mkdir(this._outDir, { recursive: true });
+        const manifest = JSON.parse(await promises_namespaceObject.readFile('package.json', { encoding: 'utf8' }));
+        const inDir = await this.prepareInDir(manifest);
         const result = await execa("npm", ["pack", "--json"], {
             shell: true,
-            cwd: tmpdir,
+            cwd: inDir,
             stdio: ['pipe', 'pipe', 'inherit']
         });
         if (result.exitCode !== 0) {
@@ -15216,7 +15263,7 @@ class PackBuild {
         const dest = external_node_path_namespaceObject.join(this._outDir, tarball);
         // Copy instead of move since e.g. GitHub Actions Windows runners host temp directories
         // on a different device (which causes fs.renameSync to fail).
-        await promises_namespaceObject.copyFile(external_node_path_namespaceObject.join(tmpdir, tarball), dest);
+        await promises_namespaceObject.copyFile(external_node_path_namespaceObject.join(inDir, tarball), dest);
         console.log(dest);
     }
     ;

package/package.json

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