@neon-rs/cli 0.0.184 → 0.0.186

package/index.js

@@ -44449,7 +44449,7 @@ function wrappy (fn, cb) {
 
 /***/ }),
 
-/***/ 5291:
+/***/ 4528:
 /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -44489,7 +44489,7 @@ 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) {
@@ -44517,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)' }
         ];
     }
@@ -44552,7 +44552,9 @@ class Dist {
         this._manifestPath = options['manifest-path'];
         this._crateName = options.name ||
             basename(ensureDefined(process.env['npm_package_name'], '$npm_package_name'));
-        this._out = options.out;
+        this._out = options.out ||
+            process.env['NEON_DIST_OUTPUT'] ||
+            'index.node';
         this._verbose = !!options.verbose;
         this.log(`crate name = "${this._crateName}"`);
     }
@@ -46459,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];
@@ -46471,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}`);
@@ -46529,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();
@@ -46595,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',
@@ -46606,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: {
@@ -46620,7 +46632,7 @@ function normalizeSourceCfg(json) {
         const targets = json.neon['targets'];
         assertIsPlatformFamily(targets, "neon.targets");
         json.neon = {
-            type: 'source',
+            type: 'library',
             org,
             platforms: targets
         };
@@ -46636,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
         };
@@ -46648,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
@@ -46657,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;
@@ -46808,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) {
@@ -46840,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}`);
@@ -46859,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)
     };
@@ -46941,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-');
@@ -46959,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
@@ -46990,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,
@@ -47112,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}`);
@@ -47147,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);
             }
         }
     }
@@ -47199,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);
     }
 }
 
@@ -47239,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));
     }
 }
@@ -47363,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}`);
         }
@@ -47416,6 +47433,124 @@ class Preset {
     }
 }
 
+;// CONCATENATED MODULE: ./data/github.json
+const github_namespaceObject = JSON.parse('{"darwin-arm64":"macOS","darwin-x64":"macOS","ios-arm64":null,"ios-x64":null,"android-arm64":"Linux","android-arm-eabi":"Linux","android-ia32":null,"android-x64":"Linux","win32-arm64-msvc":"Windows","win32-ia32-gnu":null,"win32-ia32-msvc":null,"win32-x64-gnu":null,"win32-x64-msvc":"Windows","linux-arm64-gnu":"Linux","linux-arm64-musl":null,"linux-arm-gnueabihf":"Linux","linux-arm-musleabihf":null,"linux-ia32-gnu":null,"linux-ia32-musl":null,"linux-mips-gnu":null,"linux-mips-musl":null,"linux-mips64-gnuabi64":null,"linux-mips64-muslabi64":null,"linux-mips64el-gnuabi64":null,"linux-mips64el-muslabi64":null,"linux-mipsel-gnu":null,"linux-mipsel-musl":null,"linux-powerpc-gnu":null,"linux-powerpc64-gnu":null,"linux-powerpc64le-gnu":null,"linux-riscv64gc-gnu":null,"linux-s390x-gnu":null,"linux-sparc64-gnu":null,"linux-x64-gnu":"Linux","linux-x64-gnux32":null,"linux-x64-musl":null,"freebsd-ia32":null,"freebsd-x64":null}');
+;// CONCATENATED MODULE: ./src/ci/github.ts
+
+function sort(platforms) {
+    const macOS = new Set();
+    const Windows = new Set();
+    const Linux = new Set();
+    const unsupported = new Set();
+    for (const platform of platforms) {
+        switch (github_namespaceObject[platform]) {
+            case 'macOS':
+                macOS.add(platform);
+                break;
+            case 'Windows':
+                Windows.add(platform);
+                break;
+            case 'Linux':
+                Linux.add(platform);
+                break;
+            default:
+                unsupported.add(platform);
+                break;
+        }
+    }
+    return {
+        macOS: [...macOS],
+        Windows: [...Windows],
+        Linux: [...Linux],
+        unsupported: [...unsupported]
+    };
+}
+class GitHub {
+    metadata(platforms) {
+        return sort(Object.keys(platforms));
+    }
+}
+
+;// CONCATENATED MODULE: ./src/provider.ts
+
+var ProviderName;
+(function (ProviderName) {
+    ProviderName["GitHub"] = "github";
+})(ProviderName || (ProviderName = {}));
+;
+const PROVIDERS = {
+    [ProviderName.GitHub]: GitHub
+};
+function isProviderName(s) {
+    const keys = Object.values(ProviderName);
+    return keys.includes(s);
+}
+function asProviderName(name) {
+    if (!isProviderName(name)) {
+        throw new RangeError(`CI provider not recognized: ${name}`);
+    }
+    return name;
+}
+function providerFor(name) {
+    return PROVIDERS[name];
+}
+
+;// CONCATENATED MODULE: ./src/commands/ci.ts
+
+
+
+const ci_OPTIONS = [
+    { name: 'verbose', alias: 'v', type: Boolean, defaultValue: false }
+];
+class Ci {
+    static summary() { return 'Display CI metadata for this project\'s platforms.'; }
+    static syntax() { return 'neon ci [-v] <provider>'; }
+    static options() {
+        return [
+            { name: '-v, --verbose', summary: 'Enable verbose logging. (Default: false)' },
+            { name: '<provider>', summary: 'CI provider, which can be one of the supported providers listed below.' }
+        ];
+    }
+    static seeAlso() {
+        return [
+            { name: 'GitHub Actions', summary: '<https://docs.github.com/actions>' }
+        ];
+    }
+    static extraSection() {
+        return {
+            title: 'CI Providers',
+            details: [
+                { name: 'github', summary: 'GitHub Actions.' }
+            ]
+        };
+    }
+    _verbose;
+    _provider;
+    constructor(argv) {
+        const options = dist_default()(ci_OPTIONS, { argv, partial: true });
+        this._verbose = !!options.verbose;
+        if (!options._unknown || options._unknown.length === 0) {
+            throw new Error("No arguments found, expected <provider>.");
+        }
+        const providerName = asProviderName(options._unknown[0]);
+        const providerCtor = providerFor(providerName);
+        this._provider = new providerCtor();
+    }
+    log(msg) {
+        if (this._verbose) {
+            console.error("[neon ci] " + msg);
+        }
+    }
+    async run() {
+        this.log(`reading package.json`);
+        const libManifest = await LibraryManifest.load();
+        this.log(`manifest: ${libManifest.stringify()}`);
+        const platforms = libManifest.allPlatforms();
+        const metadata = this._provider.metadata(platforms);
+        console.log(JSON.stringify(metadata, null, 2));
+    }
+}
+
 // EXTERNAL MODULE: ./src/print.ts + 26 modules
 var print = __nccwpck_require__(9050);
 ;// CONCATENATED MODULE: ./src/commands/help.ts
@@ -47459,6 +47594,7 @@ class Help {
 
 
 
+
 var CommandName;
 (function (CommandName) {
     CommandName["Help"] = "help";
@@ -47475,6 +47611,7 @@ var CommandName;
     CommandName["CurrentPlatform"] = "current-platform";
     CommandName["RustTarget"] = "rust-target";
     CommandName["Preset"] = "preset";
+    CommandName["Ci"] = "ci";
 })(CommandName || (CommandName = {}));
 ;
 function isCommandName(s) {
@@ -47501,7 +47638,8 @@ const COMMANDS = {
     [CommandName.ListPlatforms]: ListPlatforms,
     [CommandName.CurrentPlatform]: CurrentPlatform,
     [CommandName.RustTarget]: RustTarget,
-    [CommandName.Preset]: Preset
+    [CommandName.Preset]: Preset,
+    [CommandName.Ci]: Ci
 };
 function commandFor(name) {
     return COMMANDS[name];
@@ -47515,7 +47653,8 @@ function summaries() {
         { name: CommandName.UpdatePlatforms, summary: UpdatePlatforms.summary() },
         { name: CommandName.ListPlatforms, summary: ListPlatforms.summary() },
         { name: CommandName.CurrentPlatform, summary: CurrentPlatform.summary() },
-        { name: CommandName.Preset, summary: Preset.summary() }
+        { name: CommandName.Preset, summary: Preset.summary() },
+        { name: CommandName.Ci, summary: Ci.summary() }
     ];
 }
 
@@ -47529,7 +47668,7 @@ __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __we
 /* harmony import */ var command_line_commands__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(5046);
 /* harmony import */ var command_line_commands__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(command_line_commands__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _print_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(9050);
-/* harmony import */ var _command_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(5291);
+/* harmony import */ var _command_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(4528);
 /* harmony import */ var node_module__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(2033);
 /* harmony import */ var node_module__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__nccwpck_require__.n(node_module__WEBPACK_IMPORTED_MODULE_3__);
 
@@ -50552,8 +50691,8 @@ const chalkStderr = createChalk({level: stderrColor ? stderrColor.level : 0});
 
 /* harmony default export */ const chalk_source = (chalk);
 
-// EXTERNAL MODULE: ./src/command.ts + 42 modules
-var command = __nccwpck_require__(5291);
+// EXTERNAL MODULE: ./src/command.ts + 46 modules
+var command = __nccwpck_require__(4528);
 ;// CONCATENATED MODULE: ./src/print.ts
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-rs/cli",
-  "version": "0.0.184",
+  "version": "0.0.186",
   "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.184",
-    "@cargo-messages/darwin-arm64": "0.0.184",
-    "@cargo-messages/darwin-x64": "0.0.184",
-    "@cargo-messages/linux-arm-gnueabihf": "0.0.184",
-    "@cargo-messages/linux-x64-gnu": "0.0.184",
-    "@cargo-messages/win32-arm64-msvc": "0.0.184",
-    "@cargo-messages/win32-x64-msvc": "0.0.184"
+    "@cargo-messages/android-arm-eabi": "0.0.186",
+    "@cargo-messages/darwin-arm64": "0.0.186",
+    "@cargo-messages/darwin-x64": "0.0.186",
+    "@cargo-messages/linux-arm-gnueabihf": "0.0.186",
+    "@cargo-messages/linux-x64-gnu": "0.0.186",
+    "@cargo-messages/win32-arm64-msvc": "0.0.186",
+    "@cargo-messages/win32-x64-msvc": "0.0.186"
   }
 }