@swiftbrowser/cli 0.1.0 → 0.3.0

package/dist/packages.js

@@ -0,0 +1,149 @@
+// The Swift packages an Xcode project depends on (Package Dependencies in
+// Xcode: `XCRemoteSwiftPackageReference`, `XCLocalSwiftPackageReference`).
+// Each becomes one of two things in the staging package:
+//
+// - a real SwiftPM dependency, with the version rule the project records, so
+//   a pure-Swift package that builds for WASI is fetched and compiled into
+//   the module like any other code;
+// - nothing, for a package SwiftBrowser knows cannot work in the browser
+//   (a camera scanner over AVFoundation and UIKit): the shim ships a module
+//   of the same name with the package's public API (`STAND_IN_FRAMEWORKS`
+//   in compat.ts), linked when a source imports it.
+import path from 'node:path';
+import { packageIdentity } from '@swiftbrowser/xcodeproj';
+/**
+ * Packages the shim stands in for, by SwiftPM identity, with the reason the
+ * real one cannot be used and the products it provides. Each product is a
+ * module of the SwiftBrowser package (Sources/<Product>), listed in
+ * `STAND_IN_FRAMEWORKS`. When another package depends on one, the staging
+ * gives that package a redirect in its place (vendor.ts).
+ */
+export const PACKAGE_STAND_INS = {};
+/** `swiftbrowser.json`'s packages (config.ts), as the Xcode project's are: paths relative to `root`. */
+export function configPackages(packages, root) {
+    return packages.map((entry) => {
+        if (entry.path) {
+            const dir = path.resolve(root, entry.path);
+            return { reference: { kind: 'local', path: dir, identity: packageIdentity(dir) }, products: [...entry.products] };
+        }
+        const url = entry.url;
+        const requirement = entry.from
+            ? { kind: 'upToNextMajorVersion', minimumVersion: entry.from }
+            : entry.exact
+                ? { kind: 'exactVersion', version: entry.exact }
+                : entry.branch
+                    ? { kind: 'branch', branch: entry.branch }
+                    : { kind: 'revision', revision: entry.revision };
+        return { reference: { kind: 'remote', url, identity: packageIdentity(url), requirement }, products: [...entry.products] };
+    });
+}
+/** Groups a target's package products by package, in the order the project lists them. */
+export function groupPackageProducts(dependencies) {
+    const byIdentity = new Map();
+    const out = [];
+    for (const dependency of dependencies) {
+        if (!dependency.package) {
+            out.push({ products: [dependency.product] });
+            continue;
+        }
+        const key = `${dependency.package.kind}:${dependency.package.identity}`;
+        let entry = byIdentity.get(key);
+        if (!entry) {
+            entry = { reference: dependency.package, products: [] };
+            byIdentity.set(key, entry);
+            out.push(entry);
+        }
+        if (!entry.products.includes(dependency.product))
+            entry.products.push(dependency.product);
+    }
+    return out;
+}
+/** What the staging does with each package (`standIns` for tests: none today). */
+export function planPackages(packages, standIns = PACKAGE_STAND_INS) {
+    return packages.map((entry) => {
+        const reference = entry.reference;
+        if (!reference) {
+            return { kind: 'unresolved', package: entry, problem: 'the project does not say which package it comes from' };
+        }
+        const standIn = standIns[reference.identity];
+        if (standIn)
+            return { kind: 'stand-in', package: entry, reason: standIn.reason };
+        if (reference.kind === 'local') {
+            return { kind: 'dependency', package: entry, identity: reference.identity, declaration: `.package(path: ${JSON.stringify(reference.path)})` };
+        }
+        if (!reference.requirement) {
+            return { kind: 'unresolved', package: entry, problem: 'its dependency rule is not one SwiftBrowser knows; set a version in Xcode' };
+        }
+        return {
+            kind: 'dependency',
+            package: entry,
+            identity: reference.identity,
+            declaration: `.package(url: ${JSON.stringify(reference.url)}, ${requirementArgument(reference.requirement)})`,
+        };
+    });
+}
+/** Xcode's dependency rule as the argument of SwiftPM's `.package(url:…)`. */
+export function requirementArgument(requirement) {
+    switch (requirement.kind) {
+        case 'upToNextMajorVersion':
+            return `from: ${JSON.stringify(requirement.minimumVersion)}`;
+        case 'upToNextMinorVersion':
+            return `.upToNextMinor(from: ${JSON.stringify(requirement.minimumVersion)})`;
+        case 'exactVersion':
+            return `exact: ${JSON.stringify(requirement.version)}`;
+        case 'versionRange':
+            return `${JSON.stringify(requirement.minimumVersion)}..<${JSON.stringify(requirement.maximumVersion)}`;
+        case 'branch':
+            return `branch: ${JSON.stringify(requirement.branch)}`;
+        case 'revision':
+            return `revision: ${JSON.stringify(requirement.revision)}`;
+    }
+}
+/** The rule in words, as Xcode's package list shows it. */
+export function describeRequirement(requirement) {
+    switch (requirement.kind) {
+        case 'upToNextMajorVersion':
+            return `up to next major from ${requirement.minimumVersion}`;
+        case 'upToNextMinorVersion':
+            return `up to next minor from ${requirement.minimumVersion}`;
+        case 'exactVersion':
+            return `exactly ${requirement.version}`;
+        case 'versionRange':
+            return `${requirement.minimumVersion} to ${requirement.maximumVersion}`;
+        case 'branch':
+            return `branch ${requirement.branch}`;
+        case 'revision':
+            return `revision ${requirement.revision.slice(0, 12)}`;
+    }
+}
+/** A package as people name it: the URL's last component (case kept), or the folder. */
+export function packageDisplayName(entry) {
+    const reference = entry.reference;
+    if (!reference)
+        return entry.products.join(', ');
+    const location = reference.kind === 'remote' ? reference.url : reference.path;
+    const last = location.replace(/[/\\]+$/, '').split(/[/\\:]/).pop() ?? location;
+    return last.replace(/\.git$/i, '');
+}
+/** Where a package comes from, and on what rule, for the `check` report. */
+export function packageSource(entry) {
+    const reference = entry.reference;
+    if (!reference)
+        return '';
+    if (reference.kind === 'local')
+        return reference.path;
+    const url = reference.url.replace(/^https?:\/\//, '').replace(/\.git$/i, '');
+    return reference.requirement ? `${url}, ${describeRequirement(reference.requirement)}` : url;
+}
+/** Module names the dependency packages provide, guessed as their product names → the package's name. */
+export function packageModules(plans) {
+    const modules = new Map();
+    for (const plan of plans) {
+        if (plan.kind !== 'dependency')
+            continue;
+        for (const product of plan.package.products)
+            modules.set(product, packageDisplayName(plan.package));
+    }
+    return modules;
+}
+//# sourceMappingURL=packages.js.map

package/dist/packages.js.map

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

package/dist/project.d.ts

@@ -1,4 +1,7 @@
-import { type FoundationMode, type SwiftLanguageMode } from './config.js';
+import type { SwiftPackageReference } from '@swiftbrowser/xcodeproj';
+import { type SwiftLanguageMode } from './config.js';
+import { type AppPackage } from './packages.js';
+import { type SwiftSettings } from './buildSettings.js';
 export interface ResolvedApp {
     /** Swift module name (`[A-Za-z_][A-Za-z0-9_]*`); also the URL name. */
     name: string;
@@ -7,17 +10,53 @@ export interface ResolvedApp {
     root: string;
     /** Absolute paths of the Swift sources, in build order. */
     sources: string[];
+    /**
+     * Absolute paths of the Core ML models (`.mlmodel`, `.mlpackage`) the app
+     * compiles; each becomes a generated class (coreml.ts). Absent means none.
+     */
+    models?: string[];
     /** Absolute paths of `*.xcassets` directories. */
     catalogs: string[];
     /** Absolute paths of the resource files and folders `Bundle.main` serves. */
     resources: string[];
+    /**
+     * Absolute paths of the string catalogs (`.xcstrings`) and `.strings` /
+     * `.stringsdict` files compiled into the app's string tables (strings.ts).
+     * Absent means none.
+     */
+    localizations?: string[];
     /** A PNG app icon, when one was found. */
     icon?: string;
     swiftLanguageMode: SwiftLanguageMode;
-    foundation: FoundationMode;
+    /**
+     * The Xcode target's concurrency settings (default actor isolation,
+     * upcoming features; buildSettings.ts). Absent for a folder of sources.
+     */
+    swiftSettings?: SwiftSettings;
+    /**
+     * The generated asset symbols (assetSymbols.ts): `false` when the Xcode
+     * target turns them off (`ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS =
+     * NO`), `'extensions'` when it also wants the `Color` and `ShapeStyle`
+     * members (`ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS =
+     * YES`, which Xcode's templates set). Absent: the resource members only.
+     */
+    assetSymbols?: false | 'extensions';
     /** Languages whose ICU data a full-Foundation build keeps. */
     locales: string[];
+    /** The app's URL schemes (Info.plist `CFBundleURLTypes`, or `urlSchemes` in swiftbrowser.json); see urlSchemes.ts. */
+    urlSchemes?: string[];
+    /** A CORS proxy the page retries refused cross-origin reads through (`corsProxy` in swiftbrowser.json, `--cors-proxy`). */
+    corsProxy?: string;
+    /** Hosts the app's requests may not reach (`blockHosts` in swiftbrowser.json, `--block-host`). */
+    blockHosts?: string[];
+    /** Whether ICU's collation tables ship (`collation` in swiftbrowser.json; default true). */
+    collation: boolean;
     defines: string[];
+    /**
+     * The Swift packages the Xcode target links (Package Dependencies), and
+     * those `swiftbrowser.json` lists, each with its products. See packages.ts.
+     */
+    packages: AppPackage[];
     /** How the app was found. */
     origin: {
         kind: 'xcodeproj';
@@ -26,23 +65,76 @@ export interface ResolvedApp {
     } | {
         kind: 'folder';
     };
+    /**
+     * The app's unit tests, for `swiftbrowser test` (testTargets): the Xcode
+     * unit-test targets hosted by the app, or a folder's `*Tests` folders.
+     * Absent means none.
+     */
+    tests?: TestTarget[];
 }
+/** A unit-test target of the app: a module of tests that `@testable import` it. */
+export interface TestTarget {
+    /** Swift module name. */
+    name: string;
+    /** Absolute paths of its Swift sources. */
+    sources: string[];
+}
+/** Xcode's product type of a unit-test bundle (UI tests, `bundle.ui-testing`, drive a simulator and are not run). */
+export declare const UNIT_TEST_PRODUCT_TYPE = "com.apple.product-type.bundle.unit-test";
 export interface ResolveOptions {
     target?: string;
     configFile?: string;
-    foundation?: FoundationMode;
 }
 /** `Guess The Flag` → `GuessTheFlag`; a leading digit gets an underscore. */
 export declare function moduleName(raw: string): string;
-/** Every `.swift` file and `.xcassets` folder under `dir`, by convention. */
+/** A Core ML model Xcode compiles into a class: an `.mlmodel` file or an `.mlpackage` bundle. */
+export declare function isCoreMLModel(file: string): boolean;
+/**
+ * The unit tests of a folder of sources, by convention: the `.swift` files
+ * under its `Tests` and `*Tests` folders (`*UITests` excepted), which the app's
+ * sources leave out, as one target `<app>Tests`.
+ */
+export declare function discoverTests(dir: string, appName: string): TestTarget[];
+/**
+ * The Xcode unit-test targets that test `app`: those that depend on it or
+ * load into it (`TEST_HOST`, `BUNDLE_LOADER` naming its product). Each is a
+ * module of its own, as in Xcode.
+ */
+export declare function xcodeTestTargets(targets: readonly XcodeTargetLike[], app: XcodeTargetLike): TestTarget[];
+/** Every `.swift` file, Core ML model and `.xcassets` folder under `dir`, by convention. */
 export declare function discoverByConvention(dir: string): {
     sources: string[];
+    models: string[];
     catalogs: string[];
+    localizations: string[];
 };
 /** The largest PNG of the app icon set, for the home-screen manifest. */
 export declare function findAppIcon(catalogs: readonly string[], iconName?: string): string | undefined;
 /** `.xcodeproj` bundles directly in `dir`, else one level down. */
 export declare function xcodeProjectsIn(dir: string): string[];
+interface XcodeTargetLike {
+    name: string;
+    productName: string;
+    productType: string;
+    displayName?: string;
+    appIconName?: string;
+    swiftVersion?: string;
+    sources: string[];
+    /** Absent in @swiftbrowser/xcodeproj releases before Core ML models were read. */
+    models?: string[];
+    /** String catalogs and `.strings` / `.stringsdict` files; absent in older @swiftbrowser/xcodeproj releases. */
+    localizations?: string[];
+    resources: string[];
+    assetCatalogs: string[];
+    packageDependencies?: {
+        product: string;
+        package?: SwiftPackageReference;
+    }[];
+    /** Names of the targets it depends on; absent in older @swiftbrowser/xcodeproj releases' typings. */
+    dependencies?: string[];
+    /** Build settings (`INFOPLIST_FILE` for the URL schemes); absent in older @swiftbrowser/xcodeproj releases' typings. */
+    settings?(configuration?: string): Record<string, string>;
+}
 /** The Xcode target's copied resources: everything but asset catalogs and compiled resources, in project order. */
 export declare function bundleResources(resources: readonly string[]): string[];
 /** Resolves `input` (an .xcodeproj, a folder with one, or a folder of sources) to an app. */
@@ -54,3 +146,4 @@ export declare function resolveApp(input: string, options?: ResolveOptions): Pro
  * against its directory; the path comes back unchanged when nothing matches.
  */
 export declare function repairCase(file: string): string;
+export {};

package/dist/project.js

@@ -5,6 +5,12 @@ import { existsSync, readdirSync, statSync } from 'node:fs';
 import path from 'node:path';
 import { loadConfig } from './config.js';
 import { CliError } from './log.js';
+import { configPackages, groupPackageProducts } from './packages.js';
+import { swiftSettingsOf } from './buildSettings.js';
+import { isLocalizationFile, localizationsAmong } from './strings.js';
+import { urlSchemesOfTarget } from './urlSchemes.js';
+/** Xcode's product type of a unit-test bundle (UI tests, `bundle.ui-testing`, drive a simulator and are not run). */
+export const UNIT_TEST_PRODUCT_TYPE = 'com.apple.product-type.bundle.unit-test';
 /** Directories never searched for sources or catalogs. */
 const SKIP_DIRS = new Set(['.build', '.swiftbrowser', '.git', 'node_modules', 'DerivedData', 'Pods', 'Carthage', 'build', 'Preview Content']);
 /** `Guess The Flag` → `GuessTheFlag`; a leading digit gets an underscore. */
@@ -20,7 +26,7 @@ function walk(dir, visit) {
         if (entry.isDirectory()) {
             if (SKIP_DIRS.has(entry.name) || entry.name.startsWith('.') || /(Tests|UITests)$/.test(entry.name))
                 continue;
-            if (entry.name.endsWith('.xcassets') || entry.name.endsWith('.xcodeproj') || entry.name.endsWith('.xcworkspace')) {
+            if (entry.name.endsWith('.xcassets') || entry.name.endsWith('.xcodeproj') || entry.name.endsWith('.xcworkspace') || entry.name.endsWith('.mlpackage')) {
                 visit(full, statSync(full));
                 continue;
             }
@@ -31,31 +37,100 @@ function walk(dir, visit) {
         }
     }
 }
-/** Every `.swift` file and `.xcassets` folder under `dir`, by convention. */
+/** A Core ML model Xcode compiles into a class: an `.mlmodel` file or an `.mlpackage` bundle. */
+export function isCoreMLModel(file) {
+    return file.endsWith('.mlmodel') || file.endsWith('.mlpackage');
+}
+/** A folder of tests by convention: `Tests`, `MyAppTests`, but not `MyAppUITests`. */
+const TESTS_DIR = /Tests$/;
+const UI_TESTS_DIR = /UITests$/;
+/**
+ * The unit tests of a folder of sources, by convention: the `.swift` files
+ * under its `Tests` and `*Tests` folders (`*UITests` excepted), which the app's
+ * sources leave out, as one target `<app>Tests`.
+ */
+export function discoverTests(dir, appName) {
+    const sources = [];
+    const visit = (current, inTests) => {
+        for (const entry of readdirSync(current, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
+            const full = path.join(current, entry.name);
+            if (entry.isDirectory()) {
+                if (SKIP_DIRS.has(entry.name) || entry.name.startsWith('.') || UI_TESTS_DIR.test(entry.name) || entry.name.endsWith('.xcodeproj'))
+                    continue;
+                visit(full, inTests || TESTS_DIR.test(entry.name));
+            }
+            else if (inTests && entry.isFile() && entry.name.endsWith('.swift')) {
+                sources.push(full);
+            }
+        }
+    };
+    visit(dir, false);
+    return sources.length > 0 ? [{ name: `${appName}Tests`, sources }] : [];
+}
+/**
+ * The Xcode unit-test targets that test `app`: those that depend on it or
+ * load into it (`TEST_HOST`, `BUNDLE_LOADER` naming its product). Each is a
+ * module of its own, as in Xcode.
+ */
+export function xcodeTestTargets(targets, app) {
+    const product = app.productName || app.name;
+    const hosted = (target) => {
+        if (target.dependencies?.includes(app.name))
+            return true;
+        const settings = target.settings?.() ?? {};
+        return [settings['TEST_HOST'], settings['BUNDLE_LOADER']].some((value) => value !== undefined && value.includes(`/${product}.app/`));
+    };
+    return targets
+        .filter((target) => target.productType === UNIT_TEST_PRODUCT_TYPE && hosted(target))
+        .map((target) => ({ name: moduleName(target.productName || target.name), sources: target.sources.filter((file) => file.endsWith('.swift')) }))
+        .filter((target) => target.sources.length > 0);
+}
+/** Every `.swift` file, Core ML model and `.xcassets` folder under `dir`, by convention. */
 export function discoverByConvention(dir) {
     const sources = [];
+    const models = [];
     const catalogs = [];
+    const localizations = [];
     walk(dir, (file) => {
         if (file.endsWith('.swift') && !/(Tests|UITests)\.swift$/.test(path.basename(file)) && !/Package\.swift$/.test(file))
             sources.push(file);
+        else if (isCoreMLModel(file))
+            models.push(file);
         else if (file.endsWith('.xcassets'))
             catalogs.push(file);
+        else if (file.endsWith('.xcstrings') || (isLocalizationFile(file) && path.dirname(file).endsWith('.lproj')))
+            localizations.push(file);
     });
-    return { sources, catalogs };
+    return { sources, models, catalogs, localizations };
+}
+/** A string catalog, table or `.lproj` folder: compiled into string tables, not copied. */
+function isLocalizationSource(file) {
+    return isLocalizationFile(file) || file.endsWith('.lproj');
 }
-/** Swift files named by a config `sources` list: files as is, directories recursively. */
+/**
+ * Swift files and Core ML models named by a config `sources` list: files as
+ * is (a model by its extension), directories recursively.
+ */
 function expandSources(root, entries) {
-    const out = [];
+    const sources = [];
+    const models = [];
     for (const entry of entries) {
         const full = path.resolve(root, entry);
         if (!existsSync(full))
             throw new CliError(`sources entry not found: ${entry}`);
-        if (statSync(full).isDirectory())
-            out.push(...discoverByConvention(full).sources);
-        else
-            out.push(full);
+        if (isCoreMLModel(full)) {
+            models.push(full);
+        }
+        else if (statSync(full).isDirectory()) {
+            const found = discoverByConvention(full);
+            sources.push(...found.sources);
+            models.push(...found.models);
+        }
+        else {
+            sources.push(full);
+        }
     }
-    return out;
+    return { sources, models };
 }
 function applyExcludes(root, files, exclude) {
     if (!exclude || exclude.length === 0)
@@ -137,9 +212,9 @@ export async function resolveApp(input, options = {}) {
     }
     const config = loadConfig(root, options.configFile);
     const swiftLanguageMode = config.swiftLanguageMode ?? '5';
-    const foundation = options.foundation ?? config.foundation ?? 'full';
     const defines = config.defines ?? [];
     const locales = config.locales ?? ['en'];
+    const collation = config.collation ?? true;
     if (projectPath) {
         const project = await readXcode(projectPath);
         const apps = project.appTargets();
@@ -161,48 +236,92 @@ export async function resolveApp(input, options = {}) {
         }
         if (!chosen)
             throw new CliError('no target chosen');
-        const sources = applyExcludes(root, config.sources ? expandSources(root, config.sources) : chosen.sources.filter((f) => f.endsWith('.swift')), config.exclude);
+        const listed = config.sources ? expandSources(root, config.sources) : null;
+        const sources = applyExcludes(root, listed ? listed.sources : chosen.sources.filter((f) => f.endsWith('.swift')), config.exclude);
+        const models = applyExcludes(root, listed ? listed.models : (chosen.models ?? []), config.exclude);
         const catalogs = config.catalogs ? config.catalogs.map((c) => path.resolve(root, c)) : chosen.assetCatalogs;
-        const resources = config.resources ? config.resources.map((r) => path.resolve(root, r)) : bundleResources(chosen.resources ?? []);
+        const listedResources = config.resources?.map((r) => path.resolve(root, r));
+        const resources = listedResources ? listedResources.filter((r) => !isLocalizationSource(r)) : bundleResources(chosen.resources ?? []);
+        const localizations = listedResources ? localizationsAmong(listedResources) : (chosen.localizations ?? []);
         const icon = config.icon ? path.resolve(root, config.icon) : findAppIcon(catalogs, chosen.appIconName);
         const app = {
             name: config.name ?? moduleName(chosen.productName || chosen.name),
             displayName: config.displayName ?? chosen.displayName ?? chosen.productName ?? chosen.name,
             root,
             sources,
+            models,
             catalogs,
             resources,
+            ...(localizations.length > 0 ? { localizations } : {}),
             swiftLanguageMode: config.swiftLanguageMode ?? (chosen.swiftVersion?.startsWith('6') ? '6' : swiftLanguageMode),
-            foundation,
             locales,
+            collation,
             defines,
+            packages: [...groupPackageProducts(chosen.packageDependencies ?? []), ...configPackages(config.packages ?? [], root)],
             origin: { kind: 'xcodeproj', project: projectPath, target: chosen.name },
         };
         if (icon)
             app.icon = icon;
+        const buildSettings = chosen.settings?.();
+        if (buildSettings) {
+            const settings = swiftSettingsOf(buildSettings, app.swiftLanguageMode);
+            if (settings.defaultIsolationMainActor || settings.upcomingFeatures.length > 0)
+                app.swiftSettings = settings;
+            if (/^(NO|FALSE|0)$/i.test(buildSettings['ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS'] ?? ''))
+                app.assetSymbols = false;
+            else if (/^(YES|TRUE|1)$/i.test(buildSettings['ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS'] ?? ''))
+                app.assetSymbols = 'extensions';
+        }
+        const tests = xcodeTestTargets(project.targets, chosen);
+        if (tests.length > 0)
+            app.tests = tests;
+        const urlSchemes = config.urlSchemes ?? urlSchemesOfTarget(chosen, root);
+        if (urlSchemes.length > 0)
+            app.urlSchemes = urlSchemes;
+        if (config.corsProxy)
+            app.corsProxy = config.corsProxy;
+        if (config.blockHosts?.length)
+            app.blockHosts = config.blockHosts;
         return finish(app);
     }
     const discovered = discoverByConvention(root);
-    const sources = applyExcludes(root, config.sources ? expandSources(root, config.sources) : discovered.sources, config.exclude);
+    const listed = config.sources ? expandSources(root, config.sources) : null;
+    const sources = applyExcludes(root, listed ? listed.sources : discovered.sources, config.exclude);
+    const models = applyExcludes(root, listed ? listed.models : discovered.models, config.exclude);
     const catalogs = config.catalogs ? config.catalogs.map((c) => path.resolve(root, c)) : discovered.catalogs;
-    // A plain folder has no Copy Bundle Resources phase: resources come from the config only.
-    const resources = (config.resources ?? []).map((r) => path.resolve(root, r));
+    // A plain folder has no Copy Bundle Resources phase: resources come from the
+    // config only, string tables from the config or the folder.
+    const listedResources = (config.resources ?? []).map((r) => path.resolve(root, r));
+    const resources = listedResources.filter((r) => !isLocalizationSource(r));
+    const localizations = config.resources ? localizationsAmong(listedResources) : discovered.localizations;
     const icon = config.icon ? path.resolve(root, config.icon) : findAppIcon(catalogs);
     const app = {
         name: config.name ?? moduleName(path.basename(root)),
         displayName: config.displayName ?? path.basename(root),
         root,
         sources,
+        models,
         catalogs,
         resources,
+        ...(localizations.length > 0 ? { localizations } : {}),
         swiftLanguageMode,
-        foundation,
         locales,
+        collation,
         defines,
+        packages: configPackages(config.packages ?? [], root),
         origin: { kind: 'folder' },
     };
     if (icon)
         app.icon = icon;
+    const tests = discoverTests(root, app.name);
+    if (tests.length > 0)
+        app.tests = tests;
+    if (config.urlSchemes?.length)
+        app.urlSchemes = config.urlSchemes;
+    if (config.corsProxy)
+        app.corsProxy = config.corsProxy;
+    if (config.blockHosts?.length)
+        app.blockHosts = config.blockHosts;
     return finish(app);
 }
 /**
@@ -239,6 +358,8 @@ function finish(app) {
     // An Xcode project made on macOS can name files whose case differs from the
     // disk's; repair what can be repaired, report the rest.
     app.sources = app.sources.map(repairCase);
+    if (app.models)
+        app.models = app.models.map(repairCase);
     app.catalogs = app.catalogs.map(repairCase);
     app.resources = app.resources.map(repairCase);
     if (app.icon)
@@ -247,18 +368,34 @@ function finish(app) {
     if (missing.length > 0) {
         throw new CliError(`${missing.length} source file${missing.length === 1 ? '' : 's'} named by the project ${missing.length === 1 ? 'does' : 'do'} not exist:\n  ${missing.join('\n  ')}`);
     }
+    const missingModels = (app.models ?? []).filter((file) => !existsSync(file));
+    if (missingModels.length > 0) {
+        throw new CliError(`${missingModels.length} Core ML model${missingModels.length === 1 ? '' : 's'} named by the project ${missingModels.length === 1 ? 'does' : 'do'} not exist:\n  ${missingModels.join('\n  ')}`);
+    }
     const missingResources = app.resources.filter((file) => !existsSync(file));
     if (missingResources.length > 0) {
         throw new CliError(`${missingResources.length} resource${missingResources.length === 1 ? '' : 's'} named by the project ${missingResources.length === 1 ? 'does' : 'do'} not exist:\n  ${missingResources.join('\n  ')}`);
     }
+    uniqueFileNames(app.sources);
+    for (const target of app.tests ?? []) {
+        target.sources = target.sources.map(repairCase);
+        const gone = target.sources.filter((file) => !existsSync(file));
+        if (gone.length > 0) {
+            throw new CliError(`${gone.length} test source${gone.length === 1 ? '' : 's'} named by the project ${gone.length === 1 ? 'does' : 'do'} not exist:\n  ${gone.join('\n  ')}`);
+        }
+        uniqueFileNames(target.sources);
+    }
+    return app;
+}
+/** Swift needs the files of a module to have unique names. */
+function uniqueFileNames(files) {
     const names = new Map();
-    for (const file of app.sources) {
+    for (const file of files) {
         const base = path.basename(file);
         const other = names.get(base);
         if (other)
             throw new CliError(`two sources share the file name ${base} (Swift needs unique names in a module):\n  ${other}\n  ${file}`);
         names.set(base, file);
     }
-    return app;
 }
 //# sourceMappingURL=project.js.map