@neon-rs/cli 0.0.134 → 0.0.136

package/index.js

@@ -11982,7 +11982,8 @@ const pack_build_OPTIONS = [
     { name: 'file', alias: 'f', type: String, defaultValue: 'index.node' },
     { name: 'target', alias: 't', type: String, defaultValue: null },
     { name: 'in-dir', alias: 'i', type: String, defaultValue: null },
-    { name: 'out-dir', alias: 'o', type: String, defaultValue: null }
+    { name: 'out-dir', alias: 'o', type: String, defaultValue: null },
+    { name: 'verbose', alias: 'v', type: Boolean, defaultValue: false },
 ];
 
 function isRustTarget(x) {
@@ -12007,7 +12008,8 @@ class PackBuild {
             { 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: 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)' }
+            { name: '-o, --out-dir <path>', summary: 'Output directory, recursively created if needed. (Default: ./dist)' },
+            { name: '-v, --verbose', summary: 'Enable verbose logging. (Default: false)' }
         ];
     }
     static seeAlso() {
@@ -12023,17 +12025,27 @@ class PackBuild {
         this._addon = options.file;
         this._inDir = options['in-dir'] || null;
         this._outDir = options['out-dir'] || external_node_path_namespaceObject.join(process.cwd(), 'dist');
+        this._verbose = !!options.verbose;
+    }
+    log(msg) {
+        if (this._verbose) {
+            console.error("[neon pack-build] " + msg);
+        }
     }
     async currentTarget() {
+        this.log(`rustc -vV`);
         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:'));
+        this.log(`found host line: ${hostLine}`);
         if (!hostLine) {
             throw new Error("Could not determine current Rust target (unexpected rustc output)");
         }
-        return hostLine.replace(/^host:\s+/, '');
+        const target = hostLine.replace(/^host:\s+/, '');
+        this.log(`currentTarget result: "${target}"`);
+        return target;
     }
     async createTempDir(manifest) {
         const version = manifest.version;
@@ -12074,9 +12086,15 @@ class PackBuild {
                 prebuildManifest[key] = manifest[key];
             }
         }
+        this.log(`prebuild manifest: ${JSON.stringify(prebuildManifest)}`);
+        this.log("creating temp dir");
         const tmpdir = await mktemp('neon-');
+        this.log(`created temp dir ${tmpdir}`);
+        this.log(`creating ${tmpdir}/package.json`);
         await promises_namespaceObject.writeFile(external_node_path_namespaceObject.join(tmpdir, "package.json"), JSON.stringify(prebuildManifest, null, 2));
+        this.log(`copying ${this._addon} to ${tmpdir}/index.node`);
         await promises_namespaceObject.copyFile(this._addon, external_node_path_namespaceObject.join(tmpdir, "index.node"));
+        this.log(`creating ${tmpdir}/README.md`);
         await promises_namespaceObject.writeFile(external_node_path_namespaceObject.join(tmpdir, "README.md"), `# \`${name}\`\n\n${description}\n`);
         return tmpdir;
     }
@@ -12105,26 +12123,36 @@ class PackBuild {
         };
         // FIXME: make it possible to disable this
         binaryManifest.version = version;
+        this.log(`binary manifest: ${JSON.stringify(binaryManifest)}`);
+        this.log(`creating ${this._inDir}/package.json`);
         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
+        this.log(`copying ${this._addon} to ${this._inDir}/index.node`);
         await promises_namespaceObject.copyFile(this._addon, external_node_path_namespaceObject.join(this._inDir, "index.node"));
         return this._inDir;
     }
     async run() {
+        this.log(`creating directory ${this._outDir}`);
         await promises_namespaceObject.mkdir(this._outDir, { recursive: true });
+        this.log(`reading package.json`);
         const manifest = JSON.parse(await promises_namespaceObject.readFile('package.json', { encoding: 'utf8' }));
+        this.log(`manifest: ${JSON.stringify(manifest)}`);
         const inDir = await this.prepareInDir(manifest);
+        this.log(`npm pack --json`);
         const result = await execa("npm", ["pack", "--json"], {
             shell: true,
             cwd: inDir,
             stdio: ['pipe', 'pipe', 'inherit']
         });
         if (result.exitCode !== 0) {
+            this.log(`npm pack failed with exit code ${result.exitCode}`);
             process.exit(result.exitCode);
         }
         // FIXME: comment linking to the npm issue this fixes
         const tarball = JSON.parse(result.stdout)[0].filename.replace('@', '').replace('/', '-');
+        this.log(`tarball filename: ${tarball}`);
         const dest = external_node_path_namespaceObject.join(this._outDir, tarball);
+        this.log(`copying ${external_node_path_namespaceObject.join(inDir, tarball)} to ${dest}`);
         // 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(inDir, tarball), dest);
@@ -12139,7 +12167,8 @@ class PackBuild {
 
 
 const install_builds_OPTIONS = [
-    { name: 'bundle', alias: 'b', type: String, defaultValue: null }
+    { name: 'bundle', alias: 'b', type: String, defaultValue: null },
+    { name: 'verbose', alias: 'v', type: Boolean, defaultValue: false }
 ];
 class InstallBuilds {
     static summary() { return 'Install dependencies on prebuilds in package.json.'; }
@@ -12150,7 +12179,8 @@ class InstallBuilds {
             {
                 name: '',
                 summary: 'This generated file ensures support for bundlers (e.g. @vercel/ncc), which rely on static analysis to detect and enable any addons used by the library.'
-            }
+            },
+            { name: '-v, --verbose', summary: 'Enable verbose logging. (Default: false)' }
         ];
     }
     static seeAlso() {
@@ -12161,14 +12191,24 @@ class InstallBuilds {
     constructor(argv) {
         const options = dist_default()(install_builds_OPTIONS, { argv });
         this._bundle = options.bundle || null;
+        this._verbose = !!options.verbose;
+    }
+    log(msg) {
+        if (this._verbose) {
+            console.error("[neon install-builds] " + msg);
+        }
     }
     async run() {
+        this.log(`reading package.json (CWD=${process.cwd()})`);
         const manifest = JSON.parse(await promises_namespaceObject.readFile(external_node_path_namespaceObject.join(process.cwd(), 'package.json'), { encoding: 'utf8' }));
         const version = manifest.version;
+        this.log(`determined version: ${version}`);
         const targets = Object.values(manifest.neon.targets);
         const specs = targets.map(name => `${name}@${version}`);
+        this.log(`npm install --save-exact -O ${specs.join(' ')}`);
         const result = await execa('npm', ['install', '--save-exact', '-O', ...specs], { shell: true });
         if (result.exitCode !== 0) {
+            this.log(`npm failed with exit code ${result.exitCode}`);
             console.error(result.stderr);
             process.exit(result.exitCode);
         }
@@ -12186,6 +12226,7 @@ class InstallBuilds {
 if (0) {
 `;
         const requires = targets.map(name => `  require('${name}');`).join('\n');
+        this.log(`generating bundler compatibility module at ${this._bundle}`);
         await promises_namespaceObject.writeFile(this._bundle, PREAMBLE + requires + '\n}\n');
     }
 }

package/package.json

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