crossbind 2.0.0-beta.63 → 2.0.0-beta.64

package/src/bin.js

@@ -2,9 +2,10 @@
 
 import fs from 'node:fs';
 import { execFileSync } from 'node:child_process';
-import { Command, Option } from 'commander';
+import { Option } from 'commander';
 
 import { state } from './index.js';
+import { addSystemCommands, createProgram, handleFatal } from './program.js';
 import createBridgeFile from './actions/createInterface.js';
 import createLib from './actions/createLib.js';
 import buildWasm from './actions/buildWasm.js';
@@ -15,8 +16,8 @@ import buildExternal from './actions/buildExternal.js';
 import buildPackageTypes from './actions/buildTypes.js';
 import buildLib from './actions/buildLib.js';
 import buildDependencies from './actions/buildDependencies.js';
-import writeRuntimeEntry, { removeImportHooks, writeImportHooks } from './actions/writeRuntimeEntry.js';
-import { createImportedBridges, findAppNativeImports } from './actions/createImportedBridges.js';
+import writeRuntimeEntry, { removeImportHooks, writeImportHooks, writeImportManifest } from './actions/writeRuntimeEntry.js';
+import { bindsAppImports, createImportedBridges, findAppNativeImports } from './actions/createImportedBridges.js';
 import { nativeExtensions } from './utils/nativeImports.js';
 import getDependFilePath from './integration/getDependFilePath.js';
 import { boundHeaderSpecifiers, bridgeTargets, nodeBridgeTarget, resolveBoundHeaders } from './utils/boundHeaders.js';
@@ -28,18 +29,11 @@ import { OPT_IN_PLATFORMS, selectRuntimeEnvs } from './utils/targets.js';
 import { resolveHostPlatform } from './utils/hostPlatform.js';
 import resolveEmbindNapiRoot, { resolveEmbindJsiRoot } from './utils/resolveEmbindNapi.js';
 
-import writeJson from './utils/writeJson.js';
-import flattenConfigForTable from './utils/flattenConfigForTable.js';
-import systemKeys from './utils/systemKeys.js';
 import logger from './utils/logger.js';
 import { getDockerImage, getDockerContainerName } from './utils/pullDockerImage.js';
 import {
-    RUNNER_PLATFORMS, RUNNER_ROLES, connectCommands, deploySteps, initRunner, newRunnerToken, runnerHostPort, startRunner, stopRunner,
+    RUNNER_PLATFORMS, RUNNER_ROLES, connectCommands, deleteRunner, deploySteps, initRunner, newRunnerToken, runnerHostPort, startRunner,
 } from './actions/runnerCommands.js';
-import {
-    deleteAccount as deleteCloudAccount, fetchUsage, login as loginToCloud, logout as logoutOfCloud, usageLines,
-} from './actions/cloudCommands.js';
-import { cloudUrl } from './utils/cloudAccount.js';
 import { cargoHome } from './utils/runCargo.js';
 import { conanRoot } from './utils/runConan.js';
 import { cleanDepsCache } from './utils/dependencyRebuild.js';
@@ -48,36 +42,16 @@ import { formatNoticesMarkdown, formatCycloneDxSbom, validateSpdx } from './util
 import { SBOM_FILE, nodePackageMeta, writeNodePackageLicense } from './utils/packageLicense.js';
 import findFiles from './utils/findFiles.js';
 
-const packageJSON = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
-
 const platforms = [...new Set(state.targets.map(target => target.platform).filter(t => t))];
 const archs = [...new Set(state.targets.map(target => target.arch).filter(t => t))];
 const runtimes = [...new Set(state.targets.map(target => target.runtime).filter(t => t))];
 const buildTypes = [...new Set(state.targets.map(target => target.buildType).filter(t => t))];
 const runtimeEnvs = [...new Set(state.targets.map(target => target.runtimeEnv).filter(t => t))];
 
-// Build failures bubble up as exceptions with a `cause` chain (see actions/run.js);
-// show the operator a single line — DEBUG=1 for the full stack — and exit non-zero.
-const handleFatal = (e) => {
-    if (process.env.DEBUG) {
-        console.error(e);
-    } else {
-        let message = e?.message || String(e);
-        if (e?.cause?.message) message += `\n  caused by: ${e.cause.message.split('\n')[0]}`;
-        console.error(message);
-    }
-    process.exit(1);
-};
 process.on('uncaughtException', handleFatal);
 process.on('unhandledRejection', handleFatal);
 
-const program = new Command();
-
-program
-    .name('crossbind')
-    .description('Compile C++ files to WebAssembly and native platforms.')
-    .version(packageJSON.version)
-    .showHelpAfterError();
+const program = createProgram();
 
 program.command('build')
     .description('compile the project that was set up using crossbind')
@@ -87,8 +61,9 @@ program.command('build')
     .addOption(new Option('-b, --build-type <buildType>', 'target build type').argParser(createListParser(buildTypes)))
     .addOption(new Option('-e, --runtime-env <runtimeEnv>', 'binaries to make, by runtime environment (without it, only the archives are built)').argParser(createListParser(runtimeEnvs)))
     .option('--rebuild-deps [list]', 'rebuild dependencies from source instead of using prebuilt (all, or a comma-separated list of names)')
+    .option('--bind-imports', "also bind what the app's JavaScript imports into browser binaries (node binaries always do), for a page that resolves those imports itself")
     .action((options) => {
-        const { rebuildDeps, ...rest } = options;
+        const { rebuildDeps, bindImports, ...rest } = options;
         const targetParams = { ...rest };
 
         if (!targetParams.arch) {
@@ -109,7 +84,7 @@ program.command('build')
         if (state.config.build.withBuildConfig) {
             buildExternal(targetParams);
         } else {
-            build(targetParams, rebuildDeps, binaryRuntimeEnvs);
+            build(targetParams, rebuildDeps, binaryRuntimeEnvs, { bindImports });
         }
     });
 
@@ -284,10 +259,10 @@ commandRunner.command('start')
         connectCommands(options.role, runner.url, runner.displayToken).forEach((line) => console.log(`  ${line}`));
     }));
 
-commandRunner.command('stop')
-    .description('stop and remove the local runner')
+commandRunner.command('delete')
+    .description('stop and delete the local runner')
     .addOption(roleOption())
-    .action(runnerAction((options) => stopRunner({ role: options.role })));
+    .action(runnerAction((options) => deleteRunner({ role: options.role })));
 
 commandRunner.command('init')
     .description('write a folder that deploys a runner to a hosting platform')
@@ -306,76 +281,7 @@ commandRunner.command('init')
         deploySteps(platform, dir, newRunnerToken(), options.role, url).forEach((step) => console.log(`  ${step}`));
     }));
 
-program.command('login')
-    .description('sign in to crossbind cloud with your GitHub account')
-    .action(async () => {
-        const url = cloudUrl(state.config.system);
-        const { login } = await loginToCloud({ url });
-        console.log(`crossbind: signed in to ${url} as ${login}.`);
-    });
-
-program.command('logout')
-    .description('sign out of crossbind cloud on this machine')
-    .option('--all', 'sign out every machine signed in to this account')
-    .action(async (options) => {
-        const url = cloudUrl(state.config.system);
-        const result = await logoutOfCloud({ url, all: Boolean(options.all) });
-        if (!result) {
-            console.log(`crossbind: not signed in to ${url}.`);
-        } else if (result.revoked) {
-            console.log(`crossbind: signed ${result.login} out${options.all ? ' on every machine' : ''}.`);
-        } else {
-            console.warn(`crossbind: signed out here, but crossbind cloud did not revoke the token (${result.reason.replace(/^crossbind: /, '')}). Sign in again and run crossbind logout --all to revoke it.`);
-        }
-    });
-
-program.command('usage')
-    .description('show what you used of crossbind cloud this month and what is left')
-    .action(async () => {
-        usageLines(await fetchUsage({ url: cloudUrl(state.config.system) })).forEach((line) => console.log(line));
-    });
-
-program.command('account')
-    .description('manage your crossbind cloud account')
-    .command('delete')
-    .description('delete your crossbind cloud account, with the sign-in of every machine (https://crossbind.dev/privacy/)')
-    .option('--yes', 'delete it; without this, nothing is deleted')
-    .action(async (options) => {
-        const url = cloudUrl(state.config.system);
-        if (!options.yes) {
-            throw new Error(`crossbind: this deletes your crossbind cloud account at ${url}, with the sign-in of every machine. Run crossbind account delete --yes to go ahead.`);
-        }
-        const { login } = await deleteCloudAccount({ url });
-        console.log(`crossbind: deleted the crossbind cloud account of ${login}.`);
-    });
-
-const commandConfig = program.command('config')
-    .description('manage the crossbind configuration files');
-
-commandConfig.command('get')
-    .description('get the crossbind system configuration')
-    .argument('<key>', 'configuration key to read')
-    .action((key) => getSystemConfig(key));
-
-commandConfig.command('set')
-    .description('set the crossbind system configuration')
-    .argument('<key>', 'configuration key to set')
-    .argument('<value>', 'value to assign')
-    .action((key, value) => setSystemConfig(key, value));
-
-commandConfig.command('delete')
-    .description('delete the crossbind system configuration')
-    .argument('<key>', 'configuration key to remove')
-    .action((key) => deleteSystemConfig(key));
-
-commandConfig.command('list')
-    .description('list the crossbind configurations')
-    .addOption(new Option('-t, --type <type>', 'config type').default('system').choices(['all', 'system', 'project']))
-    .action((options) => listSystemConfig(options.type));
-
-commandConfig.command('keys')
-    .description('list all available system configuration keys for crossbind')
-    .action(() => listSystemKeys());
+addSystemCommands(program);
 
 // `pnpm run <script> -- --flag` forwards the `--` literally and commander would then
 // treat the flags as positionals. Strip the first separator for commands where every
@@ -388,67 +294,6 @@ if (['build', 'clean-deps', 'licenses'].includes(argv[2])) {
 
 program.parse(argv);
 
-function listSystemKeys() {
-    console.info('Available configurations:');
-    console.table(systemKeys);
-}
-
-function getSystemConfig(systemKey) {
-    if (!systemKey) {
-        listSystemConfig('system');
-        return;
-    }
-    const key = systemKey.toUpperCase();
-    const output = {};
-    if (key in state.config.system) {
-        output[key] = { value: state.config.system[key] || 'undefined', default: systemKeys[key].default };
-    }
-    Object.keys(systemKeys).filter((k) => k.includes(key)).forEach((k) => {
-        if (k in state.config.system) {
-            output[k] = { value: state.config.system[k] || 'undefined', default: systemKeys[k].default };
-        }
-    });
-
-    console.table(output);
-}
-
-function setSystemConfig(key, value) {
-    if (!systemKeys[key]) {
-        throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
-    }
-    if (systemKeys[key].options && !systemKeys[key].options.includes(value)) {
-        throw new Error(`Value ${value} is not available. Please choose from the following available values: ${systemKeys[key].options.join(', ')}`);
-    }
-
-    state.config.system[key] = value;
-    writeJson(state.config.paths.systemConfig, state.config.system);
-}
-
-function deleteSystemConfig(key) {
-    if (!systemKeys[key]) {
-        throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
-    }
-    delete state.config.system[key];
-    writeJson(state.config.paths.systemConfig, state.config.system);
-}
-
-function listSystemConfig(type) {
-    const { system: systemConfig, ...projectConfig } = state.config;
-    if (type === 'all' || type === 'system') {
-        console.log('System Configuration');
-        console.table(systemConfig);
-    }
-
-    if (type === 'all') {
-        console.log('');
-    }
-
-    if (type === 'all' || type === 'project') {
-        console.log(`Project Configuration (paths relative to ${projectConfig.paths.base})`);
-        console.table(flattenConfigForTable(projectConfig, { base: projectConfig.paths.base }));
-    }
-}
-
 function run(programName, params) {
     runCrossbindApp(programName, params, null, null, { console: true });
 }
@@ -461,7 +306,7 @@ function onlyLoadsPackagedAddons(binaryParams) {
     return targets.every((target) => target.runtimeEnv === 'node' && target.platform !== 'wasm') && addonsInPackages();
 }
 
-async function build(targetParams, rebuildOption, binaryRuntimeEnvs) {
+async function build(targetParams, rebuildOption, binaryRuntimeEnvs, wasmOptions = {}) {
     await buildDependencies({ targetParams, rebuildOption });
     const binaryParams = { ...targetParams, runtimeEnv: binaryRuntimeEnvs };
     if (!onlyLoadsPackagedAddons(binaryParams)) {
@@ -470,7 +315,7 @@ async function build(targetParams, rebuildOption, binaryRuntimeEnvs) {
     if (binaryRuntimeEnvs.length === 0) {
         logger.info(`crossbind: no runtime environment was selected, so only the archives were built - pass -e (${runtimeEnvs.join(', ')}) for a binary.`);
     } else {
-        await createWasmJs(binaryParams);
+        await createWasmJs(binaryParams, wasmOptions);
         await createNodeAddons(binaryParams);
         await createNativeCommands(binaryParams);
         await createWasiCommands(binaryParams);
@@ -593,16 +438,15 @@ function scopeOutputToCommonJs() {
     }
 }
 
-async function createWasmJs(targetParams) {
+async function createWasmJs(targetParams, wasmOptions = {}) {
     const targets = getFilteredBuildTargets(targetParams, { platform: 'wasm' });
     if (targets.length === 0) {
         return;
     }
     const headers = createBridges();
-    // A Node app imports what it uses through the module hooks, so a Node binary binds those imports too.
-    const isNode = (target) => target.runtimeEnv === 'node';
-    const imports = targets.some(isNode) ? findAppNativeImports([state.targets.find((t) => t.platform === 'wasm')]) : new Map();
-    const nodeHeaders = [...headers, ...createImportedBridges(headers, imports)];
+    const bindsImports = (target) => bindsAppImports(target, wasmOptions);
+    const imports = targets.some(bindsImports) ? findAppNativeImports([state.targets.find((t) => t.platform === 'wasm')]) : new Map();
+    const appHeaders = [...headers, ...createImportedBridges(headers, imports)];
     const optOf = (bridged) => ({
         buildSource: false,
         nativeGlob: [
@@ -619,7 +463,7 @@ async function createWasmJs(targetParams) {
         // link and the copy step below moved build/data away on the last run.
         const distComplete = fs.existsSync(`${state.config.paths.output}/${target.jsName}`)
             && fs.existsSync(`${state.config.paths.output}/${target.wasmName}`);
-        createLib(target, 'Bridge', optOf(isNode(target) ? nodeHeaders : headers));
+        createLib(target, 'Bridge', optOf(bindsImports(target) ? appHeaders : headers));
         const built = await buildWasm(target, { force: !distComplete });
         if (!built) {
             continue;
@@ -640,15 +484,21 @@ async function createWasmJs(targetParams) {
     if (targets.some((target) => ['node', 'edge'].includes(target.runtimeEnv))) {
         scopeOutputToCommonJs();
     }
+    // The list a page that maps the app's imports itself reads; a build without --bind-imports is not for one.
+    if (targets.some((target) => target.runtimeEnv === 'browser')) {
+        const manifest = `${state.config.paths.output}/browser/imports.json`;
+        if (wasmOptions.bindImports) writeImportManifest(manifest, appHeaders, imports, state.config.paths.project);
+        else fs.rmSync(manifest, { force: true });
+    }
     // A runtime's entry loads its single-thread wasm32 release build.
     const entryTargetOf = (runtimeEnv) => targets.find((target) => target.runtimeEnv === runtimeEnv && target.arch === 'wasm32'
         && target.runtime === 'st' && target.buildType === 'release' && fs.existsSync(`${state.config.paths.output}/${target.jsName}`));
     const nodeTarget = entryTargetOf('node');
     const edgeTarget = entryTargetOf('edge');
-    if (nodeHeaders.length && nodeTarget) {
+    if (appHeaders.length && nodeTarget) {
         const entry = `${state.config.paths.output}/node/wasm.mjs`;
-        writeRuntimeEntry(entry, nodeHeaders, ENTRY_RUNTIMES.node(nodeTarget.jsName));
-        if (imports.size) writeImportHooks(entry, nodeHeaders, imports, nativeExtensions(state.config.ext));
+        writeRuntimeEntry(entry, appHeaders, ENTRY_RUNTIMES.node(nodeTarget.jsName));
+        if (imports.size) writeImportHooks(entry, appHeaders, imports, nativeExtensions(state.config.ext));
         else removeImportHooks(entry);
     }
     if (headers.length && edgeTarget) {

package/src/cli.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+import { addSystemCommands, createProgram, handleFatal } from './program.js';
+
+// bin.js loads the project before it reads the command line, which fails outside a project; these commands need none.
+const program = createProgram();
+addSystemCommands(program);
+const withoutProject = [...program.commands.map((command) => command.name()), '-V', '--version'];
+
+if (withoutProject.includes(process.argv[2])) {
+    await program.parseAsync().catch(handleFatal);
+} else {
+    await import('./bin.js');
+}

package/src/integration/getCrossbindScript.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import getData from '../actions/getData.js';
+import getEnv from '../actions/getEnv.js';
 import loadJson from '../utils/loadJson.js';
 import state from '../state/index.js';
 import { parseSurface, createRustBridgeCrate, createCrateImportBridge } from '../utils/rustBridgeGen.js';
@@ -70,6 +70,7 @@ export function getRustSymbols(rsFile) {
             modulePath,
             spec: cargoDeps[crateName],
             cacheDir: state.config.paths.cache,
+            projectDir: state.config.paths.project,
             dtsMode: state.config.dts,
             log: () => {},
         });
@@ -110,7 +111,7 @@ function buildScript(target, symbols, base) {
     if (!target) {
         throw new Error('The target is not available!');
     }
-    const env = JSON.stringify(getData('env', target));
+    const env = JSON.stringify(getEnv(target));
     const getPlatformScript = target.platform === 'wasm' ? getWebScript : getReactNativeScript;
 
     let symbolExportDefineString = '';
@@ -178,7 +179,7 @@ function getReactNativeScript(env) {
         const RNJsiLib = TurboModuleRegistry.get('RNJsiLib');
 
         function setEnv() {
-            const env = JSON.parse('${env}');
+            const env = ${env};
             const CROSSBIND_DATA_PATH = Module.Crossbind.getEnv('CROSSBIND_DATA_PATH');
 
             Object.entries(env).forEach(([key, value]) => {

package/src/program.js

@@ -0,0 +1,169 @@
+import fs from 'node:fs';
+import { Command, Option } from 'commander';
+
+import {
+    deleteAccount as deleteCloudAccount, fetchUsage, login as loginToCloud, logout as logoutOfCloud, usageLines,
+} from './actions/cloudCommands.js';
+import { cloudUrl } from './utils/cloudAccount.js';
+import flattenConfigForTable from './utils/flattenConfigForTable.js';
+import loadSystemConfig, { systemConfigPath } from './utils/systemConfig.js';
+import systemKeys from './utils/systemKeys.js';
+import writeJson from './utils/writeJson.js';
+
+const packageJSON = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
+
+// Build failures bubble up as exceptions with a `cause` chain (see actions/run.js);
+// show the operator a single line — DEBUG=1 for the full stack — and exit non-zero.
+export const handleFatal = (e) => {
+    if (process.env.DEBUG) {
+        console.error(e);
+    } else {
+        let message = e?.message || String(e);
+        if (e?.cause?.message) message += `\n  caused by: ${e.cause.message.split('\n')[0]}`;
+        console.error(message);
+    }
+    process.exit(1);
+};
+
+export const createProgram = () => new Command()
+    .name('crossbind')
+    .description('Compile C++ files to WebAssembly and native platforms.')
+    .version(packageJSON.version)
+    .showHelpAfterError();
+
+export function addSystemCommands(program) {
+    program.command('login')
+        .description('sign in to crossbind cloud with your GitHub account')
+        .action(async () => {
+            const url = cloudUrl(loadSystemConfig());
+            const { login } = await loginToCloud({ url });
+            console.log(`crossbind: signed in to ${url} as ${login}.`);
+        });
+
+    program.command('logout')
+        .description('sign out of crossbind cloud on this machine')
+        .option('--all', 'sign out every machine signed in to this account')
+        .action(async (options) => {
+            const url = cloudUrl(loadSystemConfig());
+            const result = await logoutOfCloud({ url, all: Boolean(options.all) });
+            if (!result) {
+                console.log(`crossbind: not signed in to ${url}.`);
+            } else if (result.revoked) {
+                console.log(`crossbind: signed ${result.login} out${options.all ? ' on every machine' : ''}.`);
+            } else {
+                console.warn(`crossbind: signed out here, but crossbind cloud did not revoke the token (${result.reason.replace(/^crossbind: /, '')}). Sign in again and run crossbind logout --all to revoke it.`);
+            }
+        });
+
+    program.command('usage')
+        .description('show what you used of crossbind cloud this month and what is left')
+        .action(async () => {
+            usageLines(await fetchUsage({ url: cloudUrl(loadSystemConfig()) })).forEach((line) => console.log(line));
+        });
+
+    program.command('account')
+        .description('manage your crossbind cloud account')
+        .command('delete')
+        .description('delete your crossbind cloud account, with the sign-in of every machine (https://crossbind.dev/privacy/)')
+        .option('--yes', 'delete it; without this, nothing is deleted')
+        .action(async (options) => {
+            const url = cloudUrl(loadSystemConfig());
+            if (!options.yes) {
+                throw new Error(`crossbind: this deletes your crossbind cloud account at ${url}, with the sign-in of every machine. Run crossbind account delete --yes to go ahead.`);
+            }
+            const { login } = await deleteCloudAccount({ url });
+            console.log(`crossbind: deleted the crossbind cloud account of ${login}.`);
+        });
+
+    const commandConfig = program.command('config')
+        .description('manage the crossbind configuration files');
+
+    commandConfig.command('get')
+        .description('get the crossbind system configuration')
+        .argument('<key>', 'configuration key to read')
+        .action((key) => getSystemConfig(key));
+
+    commandConfig.command('set')
+        .description('set the crossbind system configuration')
+        .argument('<key>', 'configuration key to set')
+        .argument('<value>', 'value to assign')
+        .action((key, value) => setSystemConfig(key, value));
+
+    commandConfig.command('delete')
+        .description('delete the crossbind system configuration')
+        .argument('<key>', 'configuration key to remove')
+        .action((key) => deleteSystemConfig(key));
+
+    commandConfig.command('list')
+        .description('list the crossbind configurations')
+        .addOption(new Option('-t, --type <type>', 'config type').default('system').choices(['all', 'system', 'project']))
+        .action((options) => listSystemConfig(options.type));
+
+    commandConfig.command('keys')
+        .description('list all available system configuration keys for crossbind')
+        .action(() => listSystemKeys());
+}
+
+function listSystemKeys() {
+    console.info('Available configurations:');
+    console.table(systemKeys);
+}
+
+async function getSystemConfig(systemKey) {
+    if (!systemKey) {
+        await listSystemConfig('system');
+        return;
+    }
+    const system = loadSystemConfig();
+    const key = systemKey.toUpperCase();
+    const output = {};
+    if (key in system) {
+        output[key] = { value: system[key] || 'undefined', default: systemKeys[key].default };
+    }
+    Object.keys(systemKeys).filter((k) => k.includes(key)).forEach((k) => {
+        if (k in system) {
+            output[k] = { value: system[k] || 'undefined', default: systemKeys[k].default };
+        }
+    });
+
+    console.table(output);
+}
+
+function setSystemConfig(key, value) {
+    if (!systemKeys[key]) {
+        throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
+    }
+    if (systemKeys[key].options && !systemKeys[key].options.includes(value)) {
+        throw new Error(`Value ${value} is not available. Please choose from the following available values: ${systemKeys[key].options.join(', ')}`);
+    }
+
+    writeJson(systemConfigPath(), { ...loadSystemConfig(), [key]: value });
+}
+
+function deleteSystemConfig(key) {
+    if (!systemKeys[key]) {
+        throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
+    }
+    const { [key]: deleted, ...system } = loadSystemConfig();
+    writeJson(systemConfigPath(), system);
+}
+
+async function listSystemConfig(type) {
+    // Importing the state loads the project, which fails outside one, so only a listing of the project does.
+    const { system: systemConfig, ...projectConfig } = type === 'system'
+        ? { system: loadSystemConfig() }
+        : (await import('./state/index.js')).default.config;
+    if (type === 'all' || type === 'system') {
+        console.log('System Configuration');
+        console.table(systemConfig);
+    }
+
+    if (type === 'all') {
+        console.log('');
+    }
+
+    if (type === 'all' || type === 'project') {
+        console.log(`Project Configuration (paths relative to ${projectConfig.paths.base})`);
+        console.table(flattenConfigForTable(projectConfig, { base: projectConfig.paths.base }));
+    }
+}

package/src/state/index.js

@@ -1,7 +1,9 @@
 import fs from 'node:fs';
 import loadJson from '../utils/loadJson.js';
 import writeJson from '../utils/writeJson.js';
-import { TARGETS, targetPathOf, nodeAddonNamesOf, nativeCommandNamesOf } from '../utils/targets.js';
+import {
+    TARGETS, targetPathOf, nodeAddonNamesOf, nativeCommandNamesOf, wasiNamesOf,
+} from '../utils/targets.js';
 import { findCargoModuleImportsIn, writeCargoMarker } from '../utils/cargoImport.js';
 import { exportWasiSdkPath } from '../utils/wasiToolchain.js';
 import loadConfig, { assertBinarySelection } from './loadConfig.js';
@@ -52,8 +54,7 @@ async function initProcessState() {
             target.dataTxtName = `${state.config.general.name}-${target.path}.${target.runtimeEnv}.data.txt`;
         }
         if (target.platform === 'wasi') {
-            // A wasi build is a single command module - no JS glue, no preload.
-            target.wasmName = `${state.config.general.name}-${target.path}.wasm`;
+            Object.assign(target, wasiNamesOf(target, state.config.general.name));
         }
         if (target.runtimeEnv === 'node' && target.platform !== 'wasm') {
             Object.assign(target, nodeAddonNamesOf(target, state.config.general.name));

package/src/state/loadConfig.js

@@ -1,6 +1,5 @@
-import os from 'node:os';
 import fs from 'node:fs';
-import systemKeys from '../utils/systemKeys.js';
+import loadSystemConfig, { systemConfigPath } from '../utils/systemConfig.js';
 import loadJs from '../utils/loadJs.js';
 import {
     resolveDependencyOverride, resolveDependencyReplace, restampIdentity, resolveExcludedNames, getOverrideKey,
@@ -32,7 +31,7 @@ export function assertBinarySelection(config) {
 export default async function loadConfig(configDir = process.cwd(), configName = 'crossbind.config') {
     const config = await loadJs(configDir, configName) || {};
     if (config.excludedDependencies?.length) {
-        logger.info('crossbind: `excludedDependencies` in crossbind.config.js is no longer read — declare exclusions in crossbind.overrides.js as { <name>: false }.');
+        logger.info('crossbind: `excludedDependencies` in crossbind.config.js is no longer read — declare exclusions in crossbind.overrides.js as { <name>: { exclude: true } }.');
     }
     const overrides = await loadJs(configDir, 'crossbind.overrides');
     const exclude = resolveExcludedNames(overrides);
@@ -83,14 +82,8 @@ export default async function loadConfig(configDir = process.cwd(), configName =
         }
     });
 
-    output.paths.systemConfig = `${os.homedir()}/.crossbind.json`;
-    output.system = loadJson(output.paths.systemConfig) || {};
-
-    Object.entries(systemKeys).forEach(([key, value]) => {
-        if (!(key in output.system)) {
-            output.system[key] = value.default;
-        }
-    });
+    output.paths.systemConfig = systemConfigPath();
+    output.system = loadSystemConfig();
 
     return output;
 }

package/src/utils/appRustCrates.js

@@ -1,5 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import state from '../state/index.js';
+import { followCargoLock, recordCargoLock } from './cargoLock.js';
 import { cargoTripleFor } from './cargoTarget.js';
 import { isMtWasm, assertMtRustToolchain, cargoTargetDirFor, cargoBuildInvocation } from './rustMt.js';
 import runCargo from './runCargo.js';
@@ -110,6 +112,7 @@ export default function buildAppRustCrates(target, cacheDir, cargoDependencies =
         manifestPath: `${superDir}/Cargo.toml`,
         sysroot,
     });
+    followCargoLock(state.config.paths.project, superDir);
     const build = runCargo(args, {
         rustflags, panic, allowUnstable, target,
     });
@@ -118,5 +121,6 @@ export default function buildAppRustCrates(target, cacheDir, cargoDependencies =
     }
     const libFile = `${targetDir}/${triple}/release/libcrossbind_app_super.a`;
     if (!fs.existsSync(libFile)) throw new Error(`crossbind: expected cargo output ${libFile} not found`);
+    recordCargoLock(state.config.paths.project, superDir);
     return [libFile];
 }