@swiftbrowser/cli 0.1.0 → 0.2.0

package/dist/commands/shared.js

@@ -4,9 +4,12 @@ import path from 'node:path';
 import { swiftPackagePath } from '@swiftbrowser/swift';
 import { compatReport, rewrittenTo } from '../compat.js';
 import { CliError, bad, bold, cyan, dim, info, ok, warn, yellow } from '../log.js';
+import { packageDisplayName, packageModules, packageSource, planPackages } from '../packages.js';
+import { ensureKit, kitEnabled, kitSwiftFlags } from '../kit.js';
 import { resolveApp } from '../project.js';
 import { stage } from '../stage.js';
 import { SWIFT_VERSION, findToolchain, hasWasmSdk } from '../toolchain.js';
+import { vendorPackages } from '../vendor.js';
 import { SWIFT_INSTALL_HINT } from './doctor.js';
 /** The required toolchain, or a CliError saying how to get it. */
 export function requireToolchain(options) {
@@ -20,37 +23,89 @@ export function requireToolchain(options) {
     }
     return found.toolchain;
 }
-export async function prepare(input, options) {
+/**
+ * The shim as `build` and `dev` use it: the kit (the shim compiled once for
+ * this version, kit.ts), built first if there is none, or the shim's sources
+ * when there is no toolchain yet (the command stops after the report) or with
+ * SWIFTBROWSER_KIT=0.
+ */
+export async function wasmShim(options = {}) {
+    const source = { path: swiftPackagePath(), swiftFlags: [], kit: null };
+    const toolchain = findToolchain().toolchain;
+    if (!toolchain || !kitEnabled() || !hasWasmSdk(toolchain))
+        return source;
+    const started = Date.now();
+    let built = false;
+    const kit = await ensureKit(toolchain, source.path, {
+        onBuild: () => {
+            built = true;
+            info(dim(`compiling SwiftBrowser for WebAssembly, once for this version (a few minutes; later builds reuse it)…`));
+        },
+        onPackaged: (packaged) => info(ok(`SwiftBrowser's prebuilt modules ${dim(`(@swiftbrowser/kit, ${packaged.dir})`)}`)),
+        onPackagedRejected: (reason) => info(warn(`@swiftbrowser/kit's modules do not load with this toolchain (${reason}); compiling SwiftBrowser instead`)),
+        ...(options.verbose ? { onOutput: (chunk) => process.stdout.write(chunk) } : {}),
+    });
+    if (built)
+        info(ok(`SwiftBrowser compiled ${dim(`(${((Date.now() - started) / 1000).toFixed(1)} s, ${kit.dir})`)}`));
+    return { path: kit.package, swiftFlags: kitSwiftFlags(kit), kit };
+}
+export async function prepare(input, options, shimPackage = swiftPackagePath()) {
     const resolveOptions = {};
     if (options.target)
         resolveOptions.target = options.target;
     if (options.config)
         resolveOptions.configFile = options.config;
-    if (options.foundation)
-        resolveOptions.foundation = options.foundation;
     const app = await resolveApp(input, resolveOptions);
-    const report = compatReport(app.sources, app.foundation);
-    const staged = stage(app, swiftPackagePath());
-    return { app, report, staged };
+    if (options.corsProxy)
+        app.corsProxy = options.corsProxy;
+    if (options.blockHosts?.length)
+        app.blockHosts = [...new Set([...(app.blockHosts ?? []), ...options.blockHosts])];
+    // Finding the packages that import SwiftUI takes SwiftPM; without the
+    // toolchain the command stops with how to get it once the report is out.
+    const toolchain = findToolchain().toolchain;
+    const vendored = toolchain ? await vendorPackages(app, toolchain, shimPackage) : new Map();
+    // The modules of every package built against the shim count as supported
+    // too: an app imports its local packages' dependencies (Nuke through its
+    // own DesignSystem package, say) without linking them itself.
+    const modules = packageModules(planPackages(app.packages));
+    for (const copy of vendored.values()) {
+        for (const module of copy.modules ?? [])
+            if (!modules.has(module))
+                modules.set(module, copy.name);
+    }
+    const report = compatReport(app.sources, modules);
+    const staged = stage(app, shimPackage, { vendored });
+    for (const warning of staged.localizationWarnings)
+        info(warn(`string tables: ${warning}`));
+    return { app, report, staged, vendored };
 }
 export function describeApp(app) {
     const origin = app.origin.kind === 'xcodeproj'
         ? `${path.relative(process.cwd(), app.origin.project) || '.'} › target ${app.origin.target}`
         : `${path.relative(process.cwd(), app.root) || '.'} (folder)`;
     info(`${bold(app.displayName)} ${dim(`(${app.name})`)} from ${cyan(origin)}`);
-    info(dim(`  ${app.sources.length} Swift file${app.sources.length === 1 ? '' : 's'}, ${app.catalogs.length} asset catalog${app.catalogs.length === 1 ? '' : 's'}, Foundation: ${app.foundation}, Swift ${app.swiftLanguageMode} mode`));
+    const models = app.models?.length ?? 0;
+    const modelCount = models > 0 ? `, ${models} Core ML model${models === 1 ? '' : 's'}` : '';
+    const strings = app.localizations?.length ?? 0;
+    const stringCount = strings > 0 ? `, ${strings} string catalog${strings === 1 ? '' : 's'} or table${strings === 1 ? '' : 's'} (${app.locales.join(', ')})` : '';
+    info(dim(`  ${app.sources.length} Swift file${app.sources.length === 1 ? '' : 's'}${modelCount}, ${app.catalogs.length} asset catalog${app.catalogs.length === 1 ? '' : 's'}${stringCount}, Swift ${app.swiftLanguageMode} mode`));
 }
 /** Prints the import report; returns whether anything is known to be unsupported. */
-export function describeReport(report, app) {
+export function describeReport(report, app, vendored = new Map()) {
     let blocked = false;
     for (const module of report.modules) {
         const where = module.files.length === 1 ? path.basename(module.files[0]) : `${module.files.length} files`;
         switch (module.status) {
             case 'supported':
-                info(ok(`import ${module.module} ${dim(where)}`));
+                info(ok(`import ${module.module} ${dim(module.package ? `${where}; from package ${module.package}` : where)}`));
+                break;
+            case 'empty':
+                info(warn(`import ${module.module} ${dim(where)}`));
+                if (module.hint)
+                    info(`    ${yellow(module.hint)}`);
                 break;
             case 'rewritten':
-                info(ok(`import ${module.module} ${dim(`→ ${rewrittenTo(module.module, app.foundation)} (${where})`)}`));
+                info(ok(`import ${module.module} ${dim(`→ ${rewrittenTo(module.module)} (${where})`)}`));
                 break;
             case 'unsupported':
                 blocked = true;
@@ -63,6 +118,37 @@ export function describeReport(report, app) {
                 break;
         }
     }
+    // The Xcode project's package dependencies, and which way each went (packages.ts).
+    for (const plan of planPackages(app.packages)) {
+        const name = `package ${packageDisplayName(plan.package)}`;
+        const source = packageSource(plan.package);
+        const from = source ? dim(` (${source})`) : '';
+        switch (plan.kind) {
+            case 'dependency': {
+                const copy = vendored.get(plan.identity);
+                const patched = copy?.patched ? `, with SwiftBrowser's patch (${copy.patched} edits, packagePatches.ts)` : '';
+                const how = copy ? `built against the shim (${shimTargets(copy)})${patched}` : 'a SwiftPM dependency of the build';
+                info(ok(`${name}${from}: ${dim(`${how} (${plan.package.products.join(', ')})`)}`));
+                break;
+            }
+            case 'stand-in':
+                info(ok(`${name}${from}: ${dim(`SwiftBrowser's stand-in, not fetched (${plan.reason})`)}`));
+                break;
+            case 'unresolved':
+                info(warn(`${name}${from}: ${dim(`left out, ${plan.problem}`)}`));
+                break;
+        }
+    }
+    // Packages deeper in the graph that import SwiftUI, built from a copy too.
+    const direct = new Set(app.packages.flatMap((entry) => (entry.reference ? [entry.reference.identity] : [])));
+    for (const copy of vendored.values()) {
+        if (direct.has(copy.identity))
+            continue;
+        const version = copy.version === 'unspecified' ? '' : ` ${copy.version}`;
+        const patched = copy.patched ? `, with SwiftBrowser's patch (${copy.patched} edits, packagePatches.ts)` : '';
+        const how = copy.standIn ? `SwiftBrowser's stand-in, not built (${copy.standIn})` : `built against the shim (${shimTargets(copy)})${patched}`;
+        info(ok(`package ${copy.name}${dim(`${version}, a dependency of a dependency: ${how}`)}`));
+    }
     const previews = [...report.previews.values()].reduce((a, b) => a + b, 0);
     if (previews > 0)
         info(dim(`  ${previews} #Preview block${previews === 1 ? '' : 's'} left out`));
@@ -70,4 +156,12 @@ export function describeReport(report, app) {
         info(warn(`no @main App found among the sources of ${app.name}`));
     return blocked;
 }
+/** `Shimmer imports SwiftUI`, for the report. */
+function shimTargets(copy) {
+    if (copy.targets.length === 0)
+        return 'it depends on a package that imports SwiftUI';
+    return copy.targets
+        .map((target) => (target.imports.length > 0 ? `${target.name} imports ${target.imports.join(', ')}` : `${target.name} uses ${(target.uses ?? ['Objective-C selectors']).join(' and ')}`))
+        .join('; ');
+}
 //# sourceMappingURL=shared.js.map

package/dist/commands/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/commands/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/commands/shared.ts"],"names":[],"mappings":"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"}

package/dist/compat.d.ts

@@ -1,5 +1,9 @@
-import type { FoundationMode } from './config.js';
-export type ModuleStatus = 'supported' | 'rewritten' | 'unsupported' | 'unknown';
+/**
+ * `empty`: the shim has a module of that name with nothing in it, so an
+ * unused import compiles, and any use is a compile error (EMPTY_FRAMEWORKS;
+ * none today).
+ */
+export type ModuleStatus = 'supported' | 'rewritten' | 'empty' | 'unsupported' | 'unknown';
 export interface ModuleReport {
     module: string;
     status: ModuleStatus;
@@ -7,6 +11,8 @@ export interface ModuleReport {
     files: string[];
     /** For unsupported modules: what to do. */
     hint?: string;
+    /** For a module one of the project's Swift packages provides: the package. */
+    package?: string;
 }
 export interface CompatReport {
     modules: ModuleReport[];
@@ -15,13 +21,45 @@ export interface CompatReport {
     /** Whether some file declares `@main`. */
     hasMain: boolean;
 }
+/**
+ * Apple frameworks the shim stands in for, as far as apps commonly use them:
+ * StoreKit's `requestReview` (a no-op), Core Location's coordinate type, a
+ * LocalAuthentication `LAContext` that always succeeds, Core ML for the
+ * tabular models Create ML makes (coreml.ts), PhotosUI's `PhotosPicker` over
+ * the page's file chooser (with the `UTType`s of UniformTypeIdentifiers),
+ * Core Image's built-in filters and QR code generator (drawn by the page), and
+ * UserNotifications over the browser's Notification API; the frameworks under
+ * SwiftUI that packages build on (UIKit's images and colors, Core Graphics
+ * contexts and Image I/O sources over the shim's image recipes, CryptoKit's
+ * hashes and CommonCrypto's digest functions over them, os's locks and logs
+ * (and OSLog, which re-exports it),
+ * Combine (OpenCombine), MobileCoreServices' kUTType constants, Security's
+ * keychain items over a file in the app's home, zlib's inflate API, which
+ * re-exports Compression's, Core Text's font registration, MapKit's
+ * SwiftUI map, drawn without map data, and WeatherKit's service, whose
+ * requests throw); plus
+ * packages that cannot build for the browser (none today; see packages.ts).
+ * Each is a small module linked only into apps that import it (stage.ts).
+ */
+export declare const STAND_IN_FRAMEWORKS: readonly ["StoreKit", "CoreLocation", "LocalAuthentication", "CoreML", "PhotosUI", "UniformTypeIdentifiers", "CoreImage", "UserNotifications", "UIKit", "CoreGraphics", "ImageIO", "CryptoKit", "os", "Combine", "CommonCrypto", "MobileCoreServices", "OSLog", "Security", "Accelerate", "AppIntents", "CoreHaptics", "NaturalLanguage", "Compression", "Symbols", "AudioToolbox", "AuthenticationServices", "SafariServices", "WebKit", "CoreTransferable", "Photos", "LinkPresentation", "Translation", "FoundationModels", "AVFoundation", "AVKit", "QuickLook", "zlib", "CoreText", "MapKit", "WeatherKit"];
+/**
+ * Frameworks the shim has as empty modules: an import compiles, a use does
+ * not. Linked like the stand-ins when a source imports them.
+ */
+export declare const EMPTY_FRAMEWORKS: Readonly<Record<string, string>>;
+/** The modules the staging links when a source imports them: the stand-ins and the empty ones. */
+export declare const LINKED_FRAMEWORKS: readonly string[];
 /** The modules a Swift source imports (first path component of each import). */
 export declare function importsOf(source: string): string[];
 /** Number of `#Preview` macro uses in a source. */
 export declare function previewCount(source: string): number;
-export declare function classify(module: string, foundation: FoundationMode): ModuleStatus;
+export declare function classify(module: string): ModuleStatus;
 export declare function hintFor(module: string): string | undefined;
 /** What a `rewritten` import becomes in the staging package. */
-export declare function rewrittenTo(module: string, foundation: FoundationMode): string;
-/** Scans `files` (absolute paths) and groups their imports. */
-export declare function compatReport(files: readonly string[], foundation: FoundationMode): CompatReport;
+export declare function rewrittenTo(module: string): string;
+/**
+ * Scans `files` (absolute paths) and groups their imports. `packageModules`
+ * (module → package name) are the modules the project's Swift packages
+ * provide; they count as supported, the build fetches them.
+ */
+export declare function compatReport(files: readonly string[], packageModules?: ReadonlyMap<string, string>): CompatReport;

package/dist/compat.js

@@ -3,30 +3,53 @@
 // a wall of unresolved-identifier errors.
 import { readFileSync } from 'node:fs';
 // The C libraries are usually behind `#if canImport(...)`; whichever branch the wasm build takes is fine.
-const SUPPORTED = new Set(['SwiftUI', 'Swift', 'Observation', 'FoundationEssentials', 'FoundationLite', 'FoundationBridge', 'Charts', 'SwiftBrowser', 'WASILibc', 'Glibc', 'Musl', 'Darwin']);
+const SUPPORTED = new Set(['SwiftUI', 'Swift', 'Observation', 'Foundation', 'FoundationEssentials', 'FoundationInternationalization', 'FoundationBridge', 'Charts', 'SwiftData', 'SwiftBrowser', 'WASILibc', 'Glibc', 'Musl', 'Darwin']);
+/**
+ * Apple frameworks the shim stands in for, as far as apps commonly use them:
+ * StoreKit's `requestReview` (a no-op), Core Location's coordinate type, a
+ * LocalAuthentication `LAContext` that always succeeds, Core ML for the
+ * tabular models Create ML makes (coreml.ts), PhotosUI's `PhotosPicker` over
+ * the page's file chooser (with the `UTType`s of UniformTypeIdentifiers),
+ * Core Image's built-in filters and QR code generator (drawn by the page), and
+ * UserNotifications over the browser's Notification API; the frameworks under
+ * SwiftUI that packages build on (UIKit's images and colors, Core Graphics
+ * contexts and Image I/O sources over the shim's image recipes, CryptoKit's
+ * hashes and CommonCrypto's digest functions over them, os's locks and logs
+ * (and OSLog, which re-exports it),
+ * Combine (OpenCombine), MobileCoreServices' kUTType constants, Security's
+ * keychain items over a file in the app's home, zlib's inflate API, which
+ * re-exports Compression's, Core Text's font registration, MapKit's
+ * SwiftUI map, drawn without map data, and WeatherKit's service, whose
+ * requests throw); plus
+ * packages that cannot build for the browser (none today; see packages.ts).
+ * Each is a small module linked only into apps that import it (stage.ts).
+ */
+export const STAND_IN_FRAMEWORKS = [
+    'StoreKit', 'CoreLocation', 'LocalAuthentication', 'CoreML', 'PhotosUI', 'UniformTypeIdentifiers', 'CoreImage',
+    'UserNotifications', 'UIKit', 'CoreGraphics', 'ImageIO', 'CryptoKit', 'os', 'Combine',
+    'CommonCrypto', 'MobileCoreServices', 'OSLog', 'Security', 'Accelerate',
+    'AppIntents', 'CoreHaptics', 'NaturalLanguage', 'Compression',
+    'Symbols', 'AudioToolbox', 'AuthenticationServices', 'SafariServices', 'WebKit',
+    'CoreTransferable', 'Photos', 'LinkPresentation', 'Translation', 'FoundationModels',
+    'AVFoundation', 'AVKit', 'QuickLook', 'zlib', 'CoreText', 'MapKit', 'WeatherKit',
+];
+for (const framework of STAND_IN_FRAMEWORKS)
+    SUPPORTED.add(framework);
+/**
+ * Frameworks the shim has as empty modules: an import compiles, a use does
+ * not. Linked like the stand-ins when a source imports them.
+ */
+export const EMPTY_FRAMEWORKS = {};
+/** The modules the staging links when a source imports them: the stand-ins and the empty ones. */
+export const LINKED_FRAMEWORKS = [...STAND_IN_FRAMEWORKS, ...Object.keys(EMPTY_FRAMEWORKS)];
 /** Frameworks the browser has no counterpart for yet, with the usual way out. */
 const UNSUPPORTED = {
-    UIKit: 'UIKit has no browser counterpart; keep UIKit code behind `#if !SWIFTBROWSER`',
     AppKit: 'AppKit has no browser counterpart; keep it behind `#if !SWIFTBROWSER`',
-    Combine: 'Combine is not available (`Timer.publish` + `onReceive` work without the import); use async/await, `.task` and `@Observable` for the rest',
-    SwiftData: 'SwiftData is not available; keep models in an `@Observable` store behind `#if SWIFTBROWSER`',
     CoreData: 'Core Data is not available; keep persistence behind `#if !SWIFTBROWSER`',
-    CoreML: 'Core ML is not available; stub the model behind `#if SWIFTBROWSER`',
     CreateML: 'Create ML is not available',
     Vision: 'Vision is not available',
-    MapKit: 'MapKit is not available yet; show a placeholder behind `#if SWIFTBROWSER`',
-    CoreLocation: 'Core Location is not available yet',
-    AVFoundation: 'AVFoundation is not available; audio and video need a browser-side counterpart first',
-    AVKit: 'AVKit is not available',
-    UserNotifications: 'UserNotifications is not available; guard it with `#if !SWIFTBROWSER`',
-    StoreKit: 'StoreKit is not available',
     CloudKit: 'CloudKit is not available',
     WidgetKit: 'WidgetKit extensions do not run in the browser',
-    PhotosUI: 'PhotosUI is not available yet',
-    Photos: 'Photos is not available',
-    WebKit: 'WebKit is not available (an inline web view would be a renderer feature)',
-    CoreImage: 'Core Image is not available',
-    CoreGraphics: 'Core Graphics is only partly available (CGFloat, CGPoint, CGSize, CGRect are in the shim); remove the import',
     QuartzCore: 'QuartzCore is not available',
     Metal: 'Metal is not available',
     MetalKit: 'Metal is not available',
@@ -39,14 +62,10 @@ const UNSUPPORTED = {
     EventKit: 'EventKit is not available',
     Contacts: 'Contacts is not available',
     MessageUI: 'MessageUI is not available',
-    SafariServices: 'SafariServices is not available',
-    LocalAuthentication: 'LocalAuthentication is not available',
-    Security: 'Security is not available',
-    Network: 'Network.framework is not available; use URLSession-free fetching through the host (planned)',
+    Network: 'Network.framework is not available; URLSession (over the browser\'s fetch) is',
     TipKit: 'TipKit is not available',
-    CodeScanner: 'CodeScanner (a camera package) is not available; simulate the scan behind `#if SWIFTBROWSER`',
 };
-const IMPORT = /^\s*(?:@[A-Za-z_]+(?:\([^)]*\))?\s+)*import\s+(?:(?:struct|class|enum|protocol|typealias|func|let|var|actor)\s+)?([A-Za-z_][A-Za-z0-9_]*)/gm;
+const IMPORT = /^\s*(?:@[A-Za-z_]+(?:\([^)]*\))?\s+)*(?:(?:public|package|internal|fileprivate|private)\s+)?import\s+(?:(?:struct|class|enum|protocol|typealias|func|let|var|actor)\s+)?([A-Za-z_][A-Za-z0-9_]*)/gm;
 /** The modules a Swift source imports (first path component of each import). */
 export function importsOf(source) {
     const out = [];
@@ -58,30 +77,35 @@ export function importsOf(source) {
 export function previewCount(source) {
     return (source.match(/^\s*#Preview\b/gm) ?? []).length;
 }
-export function classify(module, foundation) {
-    if (module === 'Foundation')
-        return foundation === 'lean' ? 'rewritten' : 'supported';
-    if (module === 'FoundationLite')
-        return foundation === 'full' ? 'rewritten' : 'supported';
+export function classify(module) {
+    // Phase 14: FoundationLite (the lean mode's formatting layer) folded into
+    // Foundation; an old import of it becomes the bridge.
+    if (module === 'FoundationLite' || module === 'Dispatch')
+        return 'rewritten';
     if (SUPPORTED.has(module))
         return 'supported';
+    if (module in EMPTY_FRAMEWORKS)
+        return 'empty';
     if (module in UNSUPPORTED)
         return 'unsupported';
     return 'unknown';
 }
 export function hintFor(module) {
-    return UNSUPPORTED[module];
+    return UNSUPPORTED[module] ?? EMPTY_FRAMEWORKS[module];
 }
 /** What a `rewritten` import becomes in the staging package. */
-export function rewrittenTo(module, foundation) {
-    if (module === 'Foundation' && foundation === 'lean')
-        return 'FoundationEssentials + FoundationLite';
-    if (module === 'FoundationLite' && foundation === 'full')
+export function rewrittenTo(module) {
+    // The SDK has no Dispatch on WASI; the bridge's queues stand in.
+    if (module === 'FoundationLite' || module === 'Dispatch')
         return 'FoundationBridge';
     return module;
 }
-/** Scans `files` (absolute paths) and groups their imports. */
-export function compatReport(files, foundation) {
+/**
+ * Scans `files` (absolute paths) and groups their imports. `packageModules`
+ * (module → package name) are the modules the project's Swift packages
+ * provide; they count as supported, the build fetches them.
+ */
+export function compatReport(files, packageModules = new Map()) {
     const byModule = new Map();
     const previews = new Map();
     let hasMain = false;
@@ -95,7 +119,11 @@ export function compatReport(files, foundation) {
         for (const module of new Set(importsOf(source))) {
             let report = byModule.get(module);
             if (!report) {
-                report = { module, status: classify(module, foundation), files: [] };
+                const status = classify(module);
+                const fromPackage = status === 'unknown' ? packageModules.get(module) : undefined;
+                report = { module, status: fromPackage !== undefined ? 'supported' : status, files: [] };
+                if (fromPackage !== undefined)
+                    report.package = fromPackage;
                 const hint = hintFor(module);
                 if (hint)
                     report.hint = hint;
@@ -104,7 +132,7 @@ export function compatReport(files, foundation) {
             report.files.push(file);
         }
     }
-    const order = { unsupported: 0, unknown: 1, rewritten: 2, supported: 3 };
+    const order = { unsupported: 0, unknown: 1, empty: 2, rewritten: 3, supported: 4 };
     const modules = [...byModule.values()].sort((a, b) => order[a.status] - order[b.status] || a.module.localeCompare(b.module));
     return { modules, previews, hasMain };
 }

package/dist/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../src/compat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../src/compat.ts"],"names":[],"mappings":"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"}

package/dist/config.d.ts

@@ -1,5 +1,19 @@
-export type FoundationMode = 'lean' | 'full';
 export type SwiftLanguageMode = '5' | '6';
+/**
+ * A Swift package the app depends on, for a folder of sources (an Xcode
+ * project lists its own): a remote `url` with one rule (`from`: up to the next
+ * major version, `exact`, `branch` or `revision`), or a local `path` (relative
+ * to the project), and the products the app imports.
+ */
+export interface ConfigPackage {
+    url?: string;
+    path?: string;
+    from?: string;
+    exact?: string;
+    branch?: string;
+    revision?: string;
+    products: string[];
+}
 export interface Config {
     /** Module name of the app (letters, digits, `_`); defaults to the target or folder name. */
     name?: string;
@@ -24,22 +38,46 @@ export interface Config {
     /** Swift language mode the sources are compiled in (default 5, like Xcode's default for apps). */
     swiftLanguageMode?: SwiftLanguageMode;
     /**
-     * `full` (default): the wasm SDK's Foundation, nothing rewritten, its ICU
-     * data trimmed to `locales` (see below); about 19 MB optimized, 6.6 MB
-     * gzipped. `lean`: `import Foundation` is rewritten to FoundationEssentials
-     * + FoundationLite, a smaller module (4.5 to 9 MB) with a smaller API.
+     * The languages whose ICU locale data stays in the module (`["en"]` by
+     * default; `["*"]` keeps everything). The viewer's language is chosen among
+     * them at launch. Each language adds roughly 100 to 300 kB, Chinese 1.7 MB.
      */
-    foundation?: FoundationMode;
+    locales?: string[];
     /**
-     * In full mode, the languages whose ICU locale data is kept (BCP 47 tags;
-     * the region part is ignored, every regional variant of the language stays).
-     * Default `["en"]`, about 5.5 MB; `["*"]` keeps the SDK's whole 34 MB.
+     * Whether ICU's collation tables ship (default true). `false` saves 0.9 MB
+     * when the app never compares strings in a locale (`localizedCompare`,
+     * `localizedStandardCompare`, `.localizedStandard` sorting fall back to
+     * Unicode scalar order).
      */
-    locales?: string[];
+    collation?: boolean;
     /** Extra `-D` compilation conditions (SWIFTBROWSER is always defined). */
     defines?: string[];
+    /**
+     * The app's URL schemes, whose OAuth redirects come back through the page
+     * (docs/ops-protocol.md, "Signing in"); replaces those of the Info.plist's
+     * `CFBundleURLTypes`.
+     */
+    urlSchemes?: string[];
+    /**
+     * A CORS proxy (packages/cors-proxy, deployed on Cloudflare): the page
+     * retries a cross-origin GET or HEAD the browser refused through
+     * `<corsProxy>?url=<target>`. For apps whose servers do not allow the page's
+     * origin (images, mostly), as in screenshots and demos. `--cors-proxy`
+     * overrides it.
+     */
+    corsProxy?: string;
+    /**
+     * Hosts (and their subdomains) the app's requests may not reach in the
+     * browser: they fail as a network error does. For a public deploy of an app
+     * whose analytics belong to someone else. `--block-host` adds to them.
+     */
+    blockHosts?: string[];
+    /** Swift packages the app depends on, added to the Xcode target's (see `ConfigPackage`). */
+    packages?: ConfigPackage[];
 }
 export declare const CONFIG_FILE = "swiftbrowser.json";
 /** Reads and validates `swiftbrowser.json` in `dir` (or the file at `file`); `{}` when absent. */
 export declare function loadConfig(dir: string, file?: string): Config;
 export declare function validateConfig(raw: unknown, source?: string): Config;
+/** Whether `value` is an absolute http(s) URL (a CORS proxy's). */
+export declare function isHTTPURL(value: string): boolean;

package/dist/config.js

@@ -3,10 +3,10 @@
 // need no file at all.
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
-import { CliError } from './log.js';
+import { CliError, info, warn } from './log.js';
 export const CONFIG_FILE = 'swiftbrowser.json';
-const STRING_KEYS = ['name', 'displayName', 'target', 'icon'];
-const LIST_KEYS = ['sources', 'exclude', 'catalogs', 'resources', 'defines', 'locales'];
+const STRING_KEYS = ['name', 'displayName', 'target', 'icon', 'corsProxy'];
+const LIST_KEYS = ['sources', 'exclude', 'catalogs', 'resources', 'defines', 'locales', 'urlSchemes', 'blockHosts'];
 /** Reads and validates `swiftbrowser.json` in `dir` (or the file at `file`); `{}` when absent. */
 export function loadConfig(dir, file) {
     const configPath = file ?? path.join(dir, CONFIG_FILE);
@@ -45,26 +45,82 @@ export function validateConfig(raw, source = CONFIG_FILE) {
             throw new CliError(`${source}: "${key}" must be an array of strings`);
         config[key] = value;
     }
+    if (record['collation'] !== undefined) {
+        if (typeof record['collation'] !== 'boolean')
+            throw new CliError(`${source}: "collation" must be true or false`);
+        config.collation = record['collation'];
+    }
     if (record['swiftLanguageMode'] !== undefined) {
         const mode = String(record['swiftLanguageMode']);
         if (mode !== '5' && mode !== '6')
             throw new CliError(`${source}: "swiftLanguageMode" must be "5" or "6"`);
         config.swiftLanguageMode = mode;
     }
+    if (record['packages'] !== undefined)
+        config.packages = validatePackages(record['packages'], source);
     if (record['foundation'] !== undefined) {
-        const mode = record['foundation'];
-        if (mode !== 'lean' && mode !== 'full')
-            throw new CliError(`${source}: "foundation" must be "lean" or "full"`);
-        config.foundation = mode;
+        // Phase 14: there is one Foundation now. Old files may still say "lean" or "full".
+        info(warn(`${source}: "foundation" is ignored; the real Foundation is always used (lean mode was removed)`));
+    }
+    if (config.corsProxy !== undefined && !isHTTPURL(config.corsProxy)) {
+        throw new CliError(`${source}: "corsProxy" must be an http(s) URL`);
     }
     if (config.name !== undefined && !/^[A-Za-z_][A-Za-z0-9_]*$/.test(config.name)) {
         throw new CliError(`${source}: "name" must be a Swift module name (letters, digits, underscores)`);
     }
     for (const key of Object.keys(record)) {
-        if (!STRING_KEYS.includes(key) && !LIST_KEYS.includes(key) && key !== 'swiftLanguageMode' && key !== 'foundation' && key !== '$schema') {
+        if (!STRING_KEYS.includes(key) && !LIST_KEYS.includes(key) && key !== 'swiftLanguageMode' && key !== 'collation' && key !== 'packages' && key !== 'foundation' && key !== '$schema') {
             throw new CliError(`${source}: unknown key "${key}"`);
         }
     }
     return config;
 }
+const PACKAGE_KEYS = ['url', 'path', 'from', 'exact', 'branch', 'revision'];
+const PACKAGE_RULES = ['from', 'exact', 'branch', 'revision'];
+function validatePackages(value, source) {
+    if (!Array.isArray(value))
+        throw new CliError(`${source}: "packages" must be an array`);
+    return value.map((entry, index) => {
+        const where = `${source}: packages[${index}]`;
+        if (typeof entry !== 'object' || entry === null || Array.isArray(entry))
+            throw new CliError(`${where} must be an object`);
+        const record = entry;
+        const pkg = { products: [] };
+        for (const key of Object.keys(record)) {
+            if (!PACKAGE_KEYS.includes(key) && key !== 'products')
+                throw new CliError(`${where}: unknown key "${key}"`);
+        }
+        for (const key of PACKAGE_KEYS) {
+            const field = record[key];
+            if (field === undefined)
+                continue;
+            if (typeof field !== 'string' || field === '')
+                throw new CliError(`${where}: "${key}" must be a string`);
+            pkg[key] = field;
+        }
+        const products = record['products'];
+        if (!Array.isArray(products) || products.length === 0 || !products.every((p) => typeof p === 'string')) {
+            throw new CliError(`${where}: "products" must be a non-empty array of strings`);
+        }
+        pkg.products = products;
+        if (!pkg.url === !pkg.path)
+            throw new CliError(`${where}: give either "url" or "path"`);
+        const rules = PACKAGE_RULES.filter((key) => pkg[key] !== undefined);
+        if (pkg.url && rules.length !== 1)
+            throw new CliError(`${where}: a "url" needs one of "from", "exact", "branch" or "revision"`);
+        if (pkg.path && rules.length > 0)
+            throw new CliError(`${where}: a "path" takes no version rule`);
+        return pkg;
+    });
+}
+/** Whether `value` is an absolute http(s) URL (a CORS proxy's). */
+export function isHTTPURL(value) {
+    try {
+        const url = new URL(value);
+        return url.protocol === 'http:' || url.protocol === 'https:';
+    }
+    catch {
+        return false;
+    }
+}
 //# sourceMappingURL=config.js.map