crossbind 2.0.0-beta.67 → 2.0.0-beta.69

package/src/program.js

@@ -6,7 +6,7 @@ import {
 } from './actions/cloudCommands.js';
 import { cloudUrl } from './utils/cloudAccount.js';
 import flattenConfigForTable from './utils/flattenConfigForTable.js';
-import loadSystemConfig, { systemConfigPath } from './utils/systemConfig.js';
+import loadSystemConfig, { extensionSettingsOf, systemConfigPath } from './utils/systemConfig.js';
 import systemKeys from './utils/systemKeys.js';
 import writeJson from './utils/writeJson.js';
 
@@ -19,10 +19,14 @@ export const handleFatal = (e) => {
         console.error(e);
     } else {
         let message = e?.message || String(e);
-        if (e?.cause?.message) message += `\n  caused by: ${e.cause.message.split('\n')[0]}`;
+        // A cause the message tells already, as an extension's failed step does, is told once.
+        const cause = e?.cause?.message?.split('\n')[0];
+        if (cause && !message.includes(cause)) message += `\n  caused by: ${cause}`;
         console.error(message);
     }
-    process.exit(1);
+    // Writes to a pipe are asynchronous, so exiting at once would cut what is still queued, such as the failed
+    // command's output run.js printed: exit after both streams have written it.
+    process.stdout.write('', () => process.stderr.write('', () => process.exit(1)));
 };
 
 export const createProgram = () => new Command()
@@ -109,12 +113,30 @@ function listSystemKeys() {
     console.table(systemKeys);
 }
 
+// An extension's own setting, as its name and the setting's name it: demo-store.TOKEN.
+function extensionSetting(text) {
+    const [, extension, key] = /^([a-z][a-z0-9-]*)\.([A-Za-z][A-Za-z0-9_]*)$/.exec(text) ?? [];
+    return extension ? { extension, key: key.toUpperCase() } : null;
+}
+
+// crossbind's settings, and each extension's own by its name and the setting's.
+function shownSettings(system) {
+    const { extensions = {}, ...settings } = system;
+    const owned = Object.keys(extensions).flatMap((name) => Object.entries(extensionSettingsOf(system, name)).map(([key, value]) => [`${name}.${key}`, value]));
+    return { ...settings, ...Object.fromEntries(owned) };
+}
+
 async function getSystemConfig(systemKey) {
     if (!systemKey) {
         await listSystemConfig('system');
         return;
     }
     const system = loadSystemConfig();
+    const own = extensionSetting(systemKey);
+    if (own) {
+        console.table({ [`${own.extension}.${own.key}`]: { value: extensionSettingsOf(system, own.extension)[own.key] ?? 'undefined' } });
+        return;
+    }
     const key = systemKey.toUpperCase();
     const output = {};
     if (key in system) {
@@ -141,6 +163,15 @@ function setSystemConfig(key, value) {
 }
 
 function deleteSystemConfig(key) {
+    const own = extensionSetting(key);
+    if (own) {
+        const system = loadSystemConfig();
+        const { [own.key]: deleted, ...kept } = extensionSettingsOf(system, own.extension);
+        if (deleted === undefined) throw new Error(`Configuration ${own.extension}.${own.key} is not set.`);
+        const { [own.extension]: emptied, ...others } = system.extensions;
+        writeJson(systemConfigPath(), { ...system, extensions: Object.keys(kept).length > 0 ? { ...others, [own.extension]: kept } : others });
+        return;
+    }
     if (!systemKeys[key]) {
         throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
     }
@@ -155,7 +186,7 @@ async function listSystemConfig(type) {
         : (await import('./state/index.js')).default.config;
     if (type === 'all' || type === 'system') {
         console.log('System Configuration');
-        console.table(systemConfig);
+        console.table(shownSettings(systemConfig));
     }
 
     if (type === 'all') {

package/src/state/index.js

@@ -7,6 +7,7 @@ import {
 import { findCargoModuleImportsIn, writeCargoMarker } from '../utils/cargoImport.js';
 import { exportWasiSdkPath } from '../utils/wasiToolchain.js';
 import loadConfig, { assertBinarySelection } from './loadConfig.js';
+import { configChangesOf } from '../utils/configChanges.js';
 import refreshConanDependencies from './refreshConanDependencies.js';
 
 const cacheDir = `${process.cwd()}/.crossbind`;
@@ -25,7 +26,7 @@ await initProcessState();
 
 async function initProcessState() {
     state.cache = loadCacheState();
-    state.config = await loadConfig();
+    state.config = await loadConfig(undefined, undefined, { changes: configChangesOf() });
     assertBinarySelection(state.config);
     refreshConanDependencies(state.config);
     exportWasiSdkPath(state.config.system);

package/src/state/loadConfig.js

@@ -14,6 +14,8 @@ import logger from '../utils/logger.js';
 import { RUNTIME_ENVS } from '../utils/targets.js';
 import { normalizeConanDependencies } from '../utils/conanDependencies.js';
 import isSourceCmakePackage from '../utils/isSourceCmakePackage.js';
+import { listedExtension } from '../utils/appExtensions.js';
+import { mergePatch } from '../utils/configChanges.js';
 // import getCmakeParameters from './getCmakeParameters.js';
 
 // For the project being built only: dependency builds load published configs that may still set
@@ -28,8 +30,14 @@ export function assertBinarySelection(config) {
     }
 }
 
-export default async function loadConfig(configDir = process.cwd(), configName = 'crossbind.config') {
-    const config = await loadJs(configDir, configName) || {};
+// The export each loaded config was filled from, as crossbind read it, which an extension's api shows.
+const exports = new WeakMap();
+export const exportOf = (config) => exports.get(config) ?? null;
+
+// The project's config, with the changes a publisher makes for its build, as a JSON merge patch of the export.
+export default async function loadConfig(configDir = process.cwd(), configName = 'crossbind.config', { changes = null } = {}) {
+    const exported = await loadJs(configDir, configName) || {};
+    const config = changes ? mergePatch(exported, changes) : exported;
     if (config.excludedDependencies?.length) {
         logger.info('crossbind: `excludedDependencies` in crossbind.config.js is no longer read — declare exclusions in crossbind.overrides.js as { <name>: { exclude: true } }.');
     }
@@ -85,6 +93,7 @@ export default async function loadConfig(configDir = process.cwd(), configName =
     output.paths.systemConfig = systemConfigPath();
     output.system = loadSystemConfig();
 
+    exports.set(output, config);
     return output;
 }
 
@@ -135,6 +144,7 @@ export function getFilledConfig(config, options = { isDepend: false }) {
         target: config.target || {},
         // An app's identity: its bundle id, on iOS the Apple team that signs it, the name it shows and its desktop window.
         app: config.app || {},
+        // What an app's host builds in beside its own extensions.
         extensions: config.extensions || [],
         package: null,
         functions: config.functions || {},
@@ -199,9 +209,10 @@ export function getFilledConfig(config, options = { isDepend: false }) {
 
     newConfig.allDependencies = flattenDependencies(newConfig.dependencies);
 
-    newConfig.extensions?.forEach(e => {
-        e?.loadConfig?.after(newConfig);
-    });
+    if (!Array.isArray(newConfig.extensions)) throw new Error('crossbind: "extensions" must be a list of extensions, as their packages\' crossbind.extension.js gives them.');
+    newConfig.extensions = newConfig.extensions.map((extension, i) => listedExtension(extension, `extensions[${i}]`, newConfig.paths.base));
+    const twice = newConfig.extensions.find(({ name }, i) => newConfig.extensions.findIndex((other) => other.name === name) !== i);
+    if (twice) throw new Error(`crossbind: "extensions" lists two extensions named ${twice.name}.`);
 
     if (newConfig.target.runtime !== 'mt' && newConfig.allDependencies.some((d) => d?.target?.runtime === 'mt')) {
         newConfig.target.runtime = 'mt';

package/src/utils/appApiHeader.js

@@ -12,6 +12,10 @@ export function compilesAsApp(target) {
     return state.config.target?.runtimeEnv === 'app' && runtimeEnvsOf(target.platform).includes('app');
 }
 
+// What an app's own code compiles with: CROSSBIND_APP, and on iOS its debug information, from which the archive's dSYM
+// gives App Store Connect its files and lines; Android's NDK keeps that by default.
+export const appCompileOptions = (target) => (compilesAsApp(target) ? ['-DCROSSBIND_APP', ...(target.platform === 'ios' ? ['-g'] : [])] : []);
+
 export function appApiHeader() {
     const header = `${resolveAppHostRoot()}/cpp/include/crossbind/app.h`;
     if (!fs.existsSync(header)) {