@neon-rs/cli 0.0.183 → 0.0.185

package/index.js

@@ -44489,12 +44489,21 @@ const OPTIONS = [
     { 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' },
+    { name: 'out', alias: 'o', type: String, defaultValue: null },
     { name: 'verbose', alias: 'v', type: Boolean, defaultValue: false }
 ];
 function createInputStream(file) {
     return file ? (0,external_node_fs_namespaceObject.createReadStream)(file) : process.stdin;
 }
+function basename(crateName) {
+    return crateName.replace(/^@[^/]*\//, '');
+}
+function ensureDefined(str, msg) {
+    if (str === undefined) {
+        throw new Error(`${msg} is not defined`);
+    }
+    return str;
+}
 class Dist {
     static summary() { return 'Generate a binary .node file from a cargo output log.'; }
     static syntax() { return 'neon dist [-n <name>] [-f <dylib>|[-l <log>] [-m <path>]] [-o <dist>]'; }
@@ -44508,7 +44517,7 @@ class Dist {
                 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)' },
+            { name: '-o, --out <dist>', summary: 'Copy output to file <dist>. (Default: $NEON_DIST_OUTPUT or index.node)' },
             { name: '-v, --verbose', summary: 'Enable verbose logging. (Default: false)' }
         ];
     }
@@ -44541,9 +44550,13 @@ class Dist {
         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;
+        this._crateName = options.name ||
+            basename(ensureDefined(process.env['npm_package_name'], '$npm_package_name'));
+        this._out = options.out ||
+            process.env['NEON_DIST_OUTPUT'] ||
+            'index.node';
         this._verbose = !!options.verbose;
+        this.log(`crate name = "${this._crateName}"`);
     }
     async findArtifact() {
         const reader = new lib.CargoReader(createInputStream(this._log), {
@@ -44580,6 +44593,11 @@ class Dist {
         // }
         // return file;
     }
+    log(msg) {
+        if (this._verbose) {
+            console.error("[neon dist] " + msg);
+        }
+    }
     async run() {
         const file = this._file || (await this.findArtifact());
         // FIXME: needs all the logic of cargo-cp-artifact (timestamp check, M1 workaround, async, errors)
@@ -46443,7 +46461,7 @@ function assertIsBinaryV1(json) {
         throw new TypeError(`expected "neon.binary.abi" to be a string or null, found ${binary.abi}`);
     }
 }
-function assertIsSourceV1(json) {
+function assertIsLibraryV1(json) {
     assertIsObject(json, "neon");
     for (const key in json) {
         const value = json[key];
@@ -46455,10 +46473,10 @@ function assertIsSourceV1(json) {
         }
     }
 }
-function assertIsSourceCfg(json) {
+function assertIsLibraryCfg(json) {
     assertHasProps(['type', 'org', 'platforms'], json, "neon");
-    if (json.type !== 'source') {
-        throw new TypeError(`expected "neon.type" property to be "source", found ${json.type}`);
+    if (json.type !== 'library') {
+        throw new TypeError(`expected "neon.type" property to be "library", found ${json.type}`);
     }
     if (typeof json.org !== 'string') {
         throw new TypeError(`expected "neon.org" to be a string, found ${json.org}`);
@@ -46513,9 +46531,9 @@ function assertHasBinaryCfg(json) {
     assertHasCfg(json);
     assertIsBinaryCfg(json.neon);
 }
-function assertHasSourceCfg(json) {
+function assertHasLibraryCfg(json) {
     assertHasCfg(json);
-    assertIsSourceCfg(json.neon);
+    assertIsLibraryCfg(json.neon);
 }
 async function readManifest(dir) {
     dir = dir ?? process.cwd();
@@ -46579,8 +46597,17 @@ function normalizeBinaryCfg(json) {
     json.neon = upgradeBinaryV1(json.neon);
     return true;
 }
-function normalizeSourceCfg(json) {
+function normalizeLibraryCfg(json) {
     assertHasCfg(json);
+    // V5 format: {
+    //   type: 'library',
+    //   org: string,
+    //   platforms: PlatformFamily,
+    //   load?: string | undefined
+    // }
+    if ('type' in json.neon && json.neon.type === 'library') {
+        return false;
+    }
     // V4 format: {
     //   neon: {
     //     type: 'source',
@@ -46590,7 +46617,8 @@ function normalizeSourceCfg(json) {
     //   }
     // }
     if ('type' in json.neon && 'platforms' in json.neon) {
-        return false;
+        json.neon.type = 'library';
+        return true;
     }
     // V3 format: {
     //   neon: {
@@ -46604,7 +46632,7 @@ function normalizeSourceCfg(json) {
         const targets = json.neon['targets'];
         assertIsPlatformFamily(targets, "neon.targets");
         json.neon = {
-            type: 'source',
+            type: 'library',
             org,
             platforms: targets
         };
@@ -46620,7 +46648,7 @@ function normalizeSourceCfg(json) {
         const platforms = json.neon['targets'];
         assertIsPlatformMap(platforms, "neon.targets");
         json.neon = {
-            type: 'source',
+            type: 'library',
             org: json.neon.org,
             platforms
         };
@@ -46632,8 +46660,8 @@ function normalizeSourceCfg(json) {
     //   }
     // }
     const targets = json.neon['targets'];
-    assertIsSourceV1(targets);
-    json.neon = upgradeSourceV1(targets);
+    assertIsLibraryV1(targets);
+    json.neon = upgradeLibraryV1(targets);
     return true;
 }
 // The source manifest is the source of truth for all Neon
@@ -46641,18 +46669,18 @@ function normalizeSourceCfg(json) {
 // for any other files to query the Neon project's metadata.
 // (Some data is replicated in the binary manifests, however,
 // since they are independently published in npm.)
-class SourceManifest extends AbstractManifest {
+class LibraryManifest extends AbstractManifest {
     _sourceJSON;
     _expandedPlatforms;
     constructor(json) {
         super(json);
-        this._upgraded = normalizeSourceCfg(this._json);
-        assertHasSourceCfg(this._json);
+        this._upgraded = normalizeLibraryCfg(this._json);
+        assertHasLibraryCfg(this._json);
         this._sourceJSON = this._json;
         this._expandedPlatforms = expandPlatformFamily(this._sourceJSON.neon.platforms);
     }
     static async load(dir) {
-        return new SourceManifest(await readManifest(dir));
+        return new LibraryManifest(await readManifest(dir));
     }
     cfg() {
         return this._sourceJSON.neon;
@@ -46792,6 +46820,11 @@ class SourceManifest extends AbstractManifest {
             platformsSrc.push(preset);
             return this.addPlatforms(expandPlatformFamily(preset));
         }
+        // Edge case: an empty object can be treated like an empty array
+        if (Object.keys(platformsSrc).length === 0) {
+            this.cfg().platforms = [];
+            return await this.addPlatformPreset(preset);
+        }
         return this.addPlatforms(expandPlatformFamily(preset), { platformsSrc });
     }
     async updateTargets(log, bundle) {
@@ -46824,7 +46857,7 @@ if (0) {
         await promises_namespaceObject.writeFile(bundle, PREAMBLE + requires + '\n}\n');
     }
 }
-function upgradeSourceV1(object) {
+function upgradeLibraryV1(object) {
     function splitSwap([key, value]) {
         if (!/^@.*\//.test(value)) {
             throw new TypeError(`expected namespaced npm package name, found ${value}`);
@@ -46843,7 +46876,7 @@ function upgradeSourceV1(object) {
         throw new Error(`multiple npm orgs found: ${orgs}`);
     }
     return {
-        type: 'source',
+        type: 'library',
         org: [...orgs][0],
         platforms: Object.fromEntries(entries)
     };
@@ -46925,12 +46958,12 @@ class Tarball {
             console.error("[neon tarball] " + msg);
         }
     }
-    async createTempDir(sourceManifest) {
+    async createTempDir(libManifest) {
         const target = this._target || await getCurrentTarget(msg => this.log(msg));
         if (!isRustTarget(target)) {
             throw new Error(`Rust target ${target} not supported.`);
         }
-        const binaryManifest = sourceManifest.manifestFor(target);
+        const binaryManifest = libManifest.manifestFor(target);
         this.log(`prebuild manifest: ${binaryManifest.stringify()}`);
         this.log("creating temp dir");
         const tmpdir = await mktemp('neon-');
@@ -46943,11 +46976,11 @@ class Tarball {
         await promises_namespaceObject.writeFile(external_node_path_namespaceObject.join(tmpdir, "README.md"), `# \`${binaryManifest.name}\`\n\n${binaryManifest.description}\n`);
         return tmpdir;
     }
-    async prepareInDir(sourceManifest) {
+    async prepareInDir(libManifest) {
         if (!this._inDir) {
-            return await this.createTempDir(sourceManifest);
+            return await this.createTempDir(libManifest);
         }
-        const version = sourceManifest.version;
+        const version = libManifest.version;
         const binaryManifest = await BinaryManifest.load(this._inDir);
         const cfg = binaryManifest.cfg();
         // Since the source manifest is the source of truth, any time there's a
@@ -46974,9 +47007,9 @@ class Tarball {
         this.log(`creating directory ${this._outDir}`);
         await promises_namespaceObject.mkdir(this._outDir, { recursive: true });
         this.log(`reading package.json`);
-        const sourceManifest = await SourceManifest.load();
-        this.log(`manifest: ${sourceManifest.stringify()}`);
-        const inDir = await this.prepareInDir(sourceManifest);
+        const libManifest = await LibraryManifest.load();
+        this.log(`manifest: ${libManifest.stringify()}`);
+        const inDir = await this.prepareInDir(libManifest);
         this.log(`npm pack --json`);
         const result = await execa("npm", ["pack", "--json"], {
             shell: true,
@@ -47096,29 +47129,29 @@ class AddPlatform {
             console.error("[neon add-platform] " + msg);
         }
     }
-    async addPlatform(sourceManifest) {
+    async addPlatform(libManifest) {
         if (!this._platform) {
             this.log('adding default system platform');
-            return optionArray(await sourceManifest.addRustTarget(await getCurrentTarget(msg => this.log(msg))));
+            return optionArray(await libManifest.addRustTarget(await getCurrentTarget(msg => this.log(msg))));
         }
         else if (isRustTarget(this._platform)) {
             this.log(`adding Rust target ${this._platform}`);
-            return optionArray(await sourceManifest.addRustTarget(this._platform));
+            return optionArray(await libManifest.addRustTarget(this._platform));
         }
         else if (isNodePlatform(this._platform)) {
             this.log(`adding Node platform ${this._platform}`);
-            return optionArray(await sourceManifest.addNodePlatform(this._platform));
+            return optionArray(await libManifest.addNodePlatform(this._platform));
         }
         else if (isPlatformPreset(this._platform)) {
-            return sourceManifest.addPlatformPreset(this._platform);
+            return libManifest.addPlatformPreset(this._platform);
         }
         else {
             throw new Error(`unrecognized platform or preset ${this._platform}`);
         }
     }
-    async createTemplateTree(sourceManifest, pair) {
+    async createTemplateTree(libManifest, pair) {
         const { node, rust } = pair;
-        const binaryManifest = sourceManifest.manifestFor(rust);
+        const binaryManifest = libManifest.manifestFor(rust);
         this.log(`prebuild manifest: ${binaryManifest.stringify()}`);
         const treeDir = external_node_path_namespaceObject.join(this._outDir, node);
         this.log(`creating ${treeDir}`);
@@ -47131,13 +47164,13 @@ class AddPlatform {
     }
     async run() {
         this.log(`reading package.json`);
-        const sourceManifest = await SourceManifest.load();
-        this.log(`manifest: ${sourceManifest.stringify()}`);
-        const modified = await this.addPlatform(sourceManifest);
+        const libManifest = await LibraryManifest.load();
+        this.log(`manifest: ${libManifest.stringify()}`);
+        const modified = await this.addPlatform(libManifest);
         if (modified.length) {
-            sourceManifest.updateTargets(msg => this.log(msg), this._bundle);
+            libManifest.updateTargets(msg => this.log(msg), this._bundle);
             for (const pair of modified) {
-                await this.createTemplateTree(sourceManifest, pair);
+                await this.createTemplateTree(libManifest, pair);
             }
         }
     }
@@ -47183,15 +47216,15 @@ class UpdatePlatforms {
     }
     async run() {
         this.log(`reading package.json (CWD=${process.cwd()})`);
-        const sourceManifest = await SourceManifest.load();
-        const version = sourceManifest.version;
-        this.log(`package.json before: ${sourceManifest.stringify()}`);
+        const libManifest = await LibraryManifest.load();
+        const version = libManifest.version;
+        this.log(`package.json before: ${libManifest.stringify()}`);
         this.log(`determined version: ${version}`);
-        if (sourceManifest.upgraded) {
+        if (libManifest.upgraded) {
             this.log(`upgrading manifest format`);
-            await sourceManifest.save();
+            await libManifest.save();
         }
-        sourceManifest.updateTargets(msg => this.log(msg), this._bundle);
+        libManifest.updateTargets(msg => this.log(msg), this._bundle);
     }
 }
 
@@ -47223,9 +47256,9 @@ class ListPlatforms {
     }
     async run() {
         this.log(`reading package.json`);
-        const sourceManifest = await SourceManifest.load();
-        this.log(`manifest: ${sourceManifest.stringify()}`);
-        const platforms = sourceManifest.allPlatforms();
+        const libManifest = await LibraryManifest.load();
+        this.log(`manifest: ${libManifest.stringify()}`);
+        const platforms = libManifest.allPlatforms();
         console.log(JSON.stringify(platforms, null, 2));
     }
 }
@@ -47347,9 +47380,9 @@ class RustTarget {
     }
     async run() {
         this.log(`reading package.json`);
-        const sourceManifest = await SourceManifest.load();
-        this.log(`manifest: ${sourceManifest.stringify()}`);
-        const rust = sourceManifest.rustTargetFor(this._platform);
+        const libManifest = await LibraryManifest.load();
+        this.log(`manifest: ${libManifest.stringify()}`);
+        const rust = libManifest.rustTargetFor(this._platform);
         if (!rust) {
             throw new Error(`no Rust target found for ${this._platform}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-rs/cli",
-  "version": "0.0.183",
+  "version": "0.0.185",
   "description": "Command-line build tool for Neon modules.",
   "type": "module",
   "exports": "./index.js",
@@ -27,12 +27,12 @@
   },
   "homepage": "https://github.com/dherman/neon-rs#readme",
   "optionalDependencies": {
-    "@cargo-messages/android-arm-eabi": "0.0.183",
-    "@cargo-messages/darwin-arm64": "0.0.183",
-    "@cargo-messages/darwin-x64": "0.0.183",
-    "@cargo-messages/linux-arm-gnueabihf": "0.0.183",
-    "@cargo-messages/linux-x64-gnu": "0.0.183",
-    "@cargo-messages/win32-arm64-msvc": "0.0.183",
-    "@cargo-messages/win32-x64-msvc": "0.0.183"
+    "@cargo-messages/android-arm-eabi": "0.0.185",
+    "@cargo-messages/darwin-arm64": "0.0.185",
+    "@cargo-messages/darwin-x64": "0.0.185",
+    "@cargo-messages/linux-arm-gnueabihf": "0.0.185",
+    "@cargo-messages/linux-x64-gnu": "0.0.185",
+    "@cargo-messages/win32-arm64-msvc": "0.0.185",
+    "@cargo-messages/win32-x64-msvc": "0.0.185"
   }
 }