@hominis/fireforge 0.54.0 → 0.60.0

package/dist/src/core/rebase-session.js

@@ -1,174 +0,0 @@
-// SPDX-License-Identifier: EUPL-1.2
-/**
- * Rebase session persistence for multi-patch Firefox source upgrades.
- * Session state is stored at `.fireforge/rebase-session.json` and
- * survives across CLI invocations so the user can fix conflicts and
- * resume with `fireforge rebase --continue`.
- */
-import { join } from 'node:path';
-import { getNodeErrorCode, toError } from '../utils/errors.js';
-import { pathExists, readJson, removeFile, writeJson } from '../utils/fs.js';
-import { isArray, isNumber, isObject, isString, isValidFirefoxProduct, isValidFirefoxVersion, } from '../utils/validation.js';
-import { getProjectPaths } from './config-paths.js';
-import { createSiblingLockPath, withFileLock } from './file-lock.js';
-// ── Helpers ──
-const SESSION_FILENAME = 'rebase-session.json';
-/** Absolute path of the session file, for messages that must name it. */
-export function getRebaseSessionPath(projectRoot) {
-    return join(getProjectPaths(projectRoot).fireforgeDir, SESSION_FILENAME);
-}
-const REBASE_PATCH_STATUSES = [
-    'pending',
-    'applied-clean',
-    'applied-fuzz',
-    'failed',
-    'resolved',
-    'skipped',
-];
-/** Validates one `patches[]` element to its declared shape. */
-/**
- * Drops payload that does not belong to an entry's status.
- *
- * Applied on read so a session whose `resolved` entry still carries
- * `error`/`conflictingFiles` loads cleanly and is corrected, instead of being refused by a
- * stricter validator mid-rebase.
- *
- * @param entry - A structurally valid entry, possibly carrying stale payload
- * @returns The entry with only the fields its status permits
- */
-function normalizeEntry(entry) {
-    if (entry.status === 'applied-fuzz') {
-        return { filename: entry.filename, status: 'applied-fuzz', fuzzFactor: entry.fuzzFactor };
-    }
-    if (entry.status === 'failed') {
-        return {
-            filename: entry.filename,
-            status: 'failed',
-            ...(entry.error !== undefined ? { error: entry.error } : {}),
-            ...(entry.conflictingFiles !== undefined ? { conflictingFiles: entry.conflictingFiles } : {}),
-        };
-    }
-    return { filename: entry.filename, status: entry.status };
-}
-function isValidPatchEntry(value) {
-    if (!isObject(value))
-        return false;
-    if (!isString(value['filename']) || value['filename'].length === 0)
-        return false;
-    if (!REBASE_PATCH_STATUSES.includes(value['status']))
-        return false;
-    if (value['fuzzFactor'] !== undefined && !isNumber(value['fuzzFactor']))
-        return false;
-    if (value['error'] !== undefined && !isString(value['error']))
-        return false;
-    const conflicting = value['conflictingFiles'];
-    if (conflicting !== undefined && (!isArray(conflicting) || !conflicting.every(isString))) {
-        return false;
-    }
-    return true;
-}
-/** Optional product field: absent is legal, present must be a real product. */
-function isValidOptionalProduct(value) {
-    return value === undefined || (isString(value) && isValidFirefoxProduct(value));
-}
-/**
- * Validates a session file against the shape the rebase commands actually
- * consume, not merely against broad field types.
- *
- * A looser predicate that checks six `typeof`s and nothing else admits
- * sessions the resume path then acts on. `patches: [null]` reaches
- * `patch-loop.ts`, which reads `.filename` off each entry and hands it to
- * `stampPatchVersions`. A `currentIndex` of `NaN` (legal for
- * `typeof === 'number'`) makes the resume loop run zero iterations and
- * report success. A negative one indexes out of range in `continue.ts`.
- * `toVersion: ""` passes `isString` and is stamped verbatim onto every
- * Furnace override's `baseVersion`. `fromProduct`/`toProduct` go unchecked
- * despite being typed `FirefoxProduct`.
- *
- * The session file is written only by `rebase/index.ts` from validated CLI
- * and config values, so every one of these is a corrupt-file or hand-edit
- * case, which is exactly what this predicate exists to catch.
- */
-function isValidSession(data) {
-    if (!isObject(data))
-        return false;
-    if (!isString(data['startedAt']) || Number.isNaN(Date.parse(data['startedAt'])))
-        return false;
-    // 4 is git's own minimum abbreviation length. 40/64 are full SHA-1/SHA-256.
-    if (!isString(data['preRebaseCommit']) || !/^[0-9a-f]{4,64}$/i.test(data['preRebaseCommit'])) {
-        return false;
-    }
-    if (!isString(data['fromVersion']) || !isValidFirefoxVersion(data['fromVersion']))
-        return false;
-    if (!isString(data['toVersion']) || !isValidFirefoxVersion(data['toVersion']))
-        return false;
-    if (!isValidOptionalProduct(data['fromProduct']))
-        return false;
-    if (!isValidOptionalProduct(data['toProduct']))
-        return false;
-    const patches = data['patches'];
-    if (!isArray(patches) || !patches.every(isValidPatchEntry))
-        return false;
-    // `<= patches.length` because the resume point legally sits one past the
-    // last entry once every patch has been processed.
-    const currentIndex = data['currentIndex'];
-    if (!isNumber(currentIndex) || !Number.isInteger(currentIndex))
-        return false;
-    return currentIndex >= 0 && currentIndex <= patches.length;
-}
-/**
- * Reads the session file, reporting absent, valid, and corrupt as three
- * distinct outcomes. Never throws for a malformed file: `readJson` calls
- * `JSON.parse` with no guard of its own, so an interrupted write would
- * otherwise surface a raw `SyntaxError` out of `--continue`/`--abort`.
- *
- * A single read determines liveness and validity: only ENOENT/ENOTDIR from
- * that read mean `absent`. A pathExists pre-probe both races deletion (a
- * file removed between probe and read misreports an absent session as
- * corrupt) and swallows EACCES (an unreadable `.fireforge/` misreports a
- * session as absent). It is the same failure `readTreeMarker` avoids for
- * tree markers.
- */
-export async function readRebaseSession(projectRoot) {
-    const path = getRebaseSessionPath(projectRoot);
-    let data;
-    try {
-        data = await readJson(path);
-    }
-    catch (error) {
-        const code = getNodeErrorCode(error);
-        if (code === 'ENOENT' || code === 'ENOTDIR')
-            return { present: false };
-        return { present: true, valid: false, reason: toError(error).message };
-    }
-    if (!isValidSession(data)) {
-        return { present: true, valid: false, reason: 'the file is not a valid rebase session' };
-    }
-    // Normalize on read: a session can carry a failure's
-    // `error`/`conflictingFiles` on an entry whose status has since been
-    // flipped to `resolved`. Correcting it here is what lets the validator
-    // stay permissive, so such an in-flight rebase still loads.
-    return {
-        present: true,
-        valid: true,
-        session: { ...data, patches: data.patches.map(normalizeEntry) },
-    };
-}
-/**
- * Persists a rebase session atomically.
- */
-export async function saveRebaseSession(projectRoot, session) {
-    const path = getRebaseSessionPath(projectRoot);
-    await withFileLock(createSiblingLockPath(path, '.rebase-session.lock'), async () => {
-        await writeJson(path, session);
-    });
-}
-/**
- * Removes the rebase session file.
- */
-export async function clearRebaseSession(projectRoot) {
-    const path = getRebaseSessionPath(projectRoot);
-    if (await pathExists(path)) {
-        await removeFile(path);
-    }
-}

package/dist/src/core/register-browser-content.d.ts

@@ -1,11 +0,0 @@
-/**
- * JS/content registration in browser/base/jar.mn.
- */
-import type { RegisterResult } from './register-result.js';
-/**
- * Registers a JS/content file in browser/base/jar.mn.
- *
- * Entry format (8-space indent):
- *         content/browser/{name}.js    (content/{name}.js)
- */
-export declare function registerBrowserContent(engineDir: string, fileName: string, after?: string, sourcePath?: string, dryRun?: boolean): Promise<RegisterResult>;

package/dist/src/core/register-browser-content.js

@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: EUPL-1.2
-/**
- * JS/content registration in browser/base/jar.mn.
- */
-import { join } from 'node:path';
-import { GeneralError } from '../errors/base.js';
-import { pathExists, readText, writeText } from '../utils/fs.js';
-import { normalizePathSlashes } from '../utils/paths.js';
-import { insertJarMnEntry } from './moz-manifest-helpers.js';
-/**
- * Tokenizer-based implementation for browser content registration.
- */
-function registerBrowserContentTokenized(content, fileName, entry, after) {
-    const { result, previousEntry, afterFallback } = insertJarMnEntry(content, entry, {
-        sortPattern: /content\/browser\/([^\s]+)/,
-        sortKey: fileName,
-        missingSectionMessage: 'Could not find content/browser/ section in browser/base/jar.mn',
-        after,
-    });
-    return { result, previousEntry, afterFallback };
-}
-/**
- * Registers a JS/content file in browser/base/jar.mn.
- *
- * Entry format (8-space indent):
- *         content/browser/{name}.js    (content/{name}.js)
- */
-export async function registerBrowserContent(engineDir, fileName, after, sourcePath, dryRun = false) {
-    const manifest = 'browser/base/jar.mn';
-    const manifestPath = join(engineDir, manifest);
-    if (!(await pathExists(manifestPath))) {
-        throw new GeneralError(`Manifest not found: ${manifest}`);
-    }
-    const source = normalizePathSlashes(sourcePath ?? `content/${fileName}`);
-    const entry = normalizePathSlashes(`        content/browser/${fileName}    (${source})`);
-    const content = await readText(manifestPath);
-    // Idempotency check
-    if (content.includes(`content/browser/${fileName}`)) {
-        return { manifest, entry, skipped: true };
-    }
-    const value = registerBrowserContentTokenized(content, fileName, entry, after);
-    if (!dryRun) {
-        await writeText(manifestPath, value.result);
-    }
-    return {
-        manifest,
-        entry,
-        previousEntry: value.previousEntry,
-        skipped: false,
-        afterFallback: value.afterFallback,
-    };
-}

package/dist/src/core/register-browser-test.d.ts

@@ -1,18 +0,0 @@
-/**
- * Test manifest registration in browser/base/moz.build.
- */
-import type { RegisterResult } from './register-result.js';
-/**
- * Registers a test manifest (browser.toml) in browser/base/moz.build.
- *
- * Entry format:
- *     "content/test/{dir}/browser.toml",
- */
-export declare function registerTestManifest(engineDir: string, testDir: string, dryRun?: boolean): Promise<RegisterResult>;
-/**
- * Deregisters a test manifest (browser.toml) from browser/base/moz.build.
- * @param engineDir - Path to the engine directory
- * @param testDir - Test directory name (e.g. 'mybrowser')
- * @returns Whether the entry was removed
- */
-export declare function deregisterTestManifest(engineDir: string, testDir: string): Promise<boolean>;

package/dist/src/core/register-browser-test.js

@@ -1,66 +0,0 @@
-// SPDX-License-Identifier: EUPL-1.2
-/**
- * Test manifest registration in browser/base/moz.build.
- */
-import { join } from 'node:path';
-import { GeneralError } from '../errors/base.js';
-import { pathExists, readText, writeText } from '../utils/fs.js';
-import { normalizePathSlashes } from '../utils/paths.js';
-import { insertMozBuildListEntry } from './moz-manifest-helpers.js';
-/**
- * Tokenizer-based implementation for test manifest registration.
- */
-function registerTestManifestTokenized(content, testDir, entry) {
-    return insertMozBuildListEntry(content, entry, {
-        listPattern: /BROWSER_CHROME_MANIFESTS/,
-        sortKey: `content/test/${testDir}/browser.toml`,
-        missingListMessage: 'Could not find BROWSER_CHROME_MANIFESTS in browser/base/moz.build',
-    });
-}
-/**
- * Registers a test manifest (browser.toml) in browser/base/moz.build.
- *
- * Entry format:
- *     "content/test/{dir}/browser.toml",
- */
-export async function registerTestManifest(engineDir, testDir, dryRun = false) {
-    const manifest = 'browser/base/moz.build';
-    const manifestPath = join(engineDir, manifest);
-    if (!(await pathExists(manifestPath))) {
-        throw new GeneralError(`Manifest not found: ${manifest}`);
-    }
-    const entry = normalizePathSlashes(`    "content/test/${testDir}/browser.toml",`);
-    const content = await readText(manifestPath);
-    // Idempotency check
-    if (content.includes(`content/test/${testDir}/browser.toml`)) {
-        return { manifest, entry, skipped: true };
-    }
-    const value = registerTestManifestTokenized(content, testDir, entry);
-    if (!dryRun) {
-        await writeText(manifestPath, value.result);
-    }
-    return { manifest, entry, previousEntry: value.previousEntry, skipped: false };
-}
-/**
- * Deregisters a test manifest (browser.toml) from browser/base/moz.build.
- * @param engineDir - Path to the engine directory
- * @param testDir - Test directory name (e.g. 'mybrowser')
- * @returns Whether the entry was removed
- */
-export async function deregisterTestManifest(engineDir, testDir) {
-    const manifest = 'browser/base/moz.build';
-    const manifestPath = join(engineDir, manifest);
-    if (!(await pathExists(manifestPath))) {
-        return false;
-    }
-    const content = await readText(manifestPath);
-    const entryPattern = `content/test/${testDir}/browser.toml`;
-    if (!content.includes(entryPattern)) {
-        return false;
-    }
-    // Remove the line containing the entry (including trailing newline)
-    const lines = content.split('\n');
-    const filtered = lines.filter((line) => !line.includes(entryPattern));
-    await writeText(manifestPath, filtered.join('\n'));
-    return true;
-}

package/dist/src/core/register-module.d.ts

@@ -1,11 +0,0 @@
-/**
- * Module registration in browser/modules/{binaryName}/moz.build.
- */
-import type { RegisterResult } from './register-result.js';
-/**
- * Registers a module in browser/modules/{binaryName}/moz.build.
- *
- * Entry format:
- *     "{name}.sys.mjs",
- */
-export declare function registerFireForgeModule(engineDir: string, fileName: string, moduleDir: string, dryRun?: boolean, createManifest?: boolean): Promise<RegisterResult>;

package/dist/src/core/register-module.js

@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: EUPL-1.2
-/**
- * Module registration in browser/modules/{binaryName}/moz.build.
- */
-import { join } from 'node:path';
-import { GeneralError } from '../errors/base.js';
-import { pathExists, readText, writeText } from '../utils/fs.js';
-import { normalizePathSlashes } from '../utils/paths.js';
-import { insertMozBuildListEntry } from './moz-manifest-helpers.js';
-import { scaffoldModuleMozBuild } from './register-scaffold.js';
-/**
- * Tokenizer-based implementation for module registration.
- */
-function registerFireForgeModuleTokenized(content, fileName, entry) {
-    return insertMozBuildListEntry(content, entry, {
-        listPattern: /EXTRA_JS_MODULES/,
-        sortKey: fileName,
-        missingListMessage: 'Could not find EXTRA_JS_MODULES in moz.build',
-    });
-}
-/**
- * Registers a module in browser/modules/{binaryName}/moz.build.
- *
- * Entry format:
- *     "{name}.sys.mjs",
- */
-export async function registerFireForgeModule(engineDir, fileName, moduleDir, dryRun = false, createManifest = false) {
-    const manifest = `${moduleDir}/moz.build`;
-    const manifestPath = join(engineDir, manifest);
-    if (!(await pathExists(manifestPath))) {
-        if (createManifest) {
-            // Registering a module under a directory with no moz.build otherwise
-            // fails with "Manifest not found". Scaffold the directory manifest and
-            // wire the parent DIRS chain.
-            const scaffoldActions = await scaffoldModuleMozBuild(engineDir, moduleDir, fileName, dryRun);
-            return {
-                manifest,
-                entry: `    "${fileName}",`,
-                skipped: false,
-                scaffoldActions,
-            };
-        }
-        throw new GeneralError(`Manifest not found: ${manifest}. Pass --create-manifest to scaffold it and wire the parent DIRS entry.`);
-    }
-    const entry = normalizePathSlashes(`    "${fileName}",`);
-    const content = await readText(manifestPath);
-    // Idempotency check
-    if (content.includes(`"${fileName}"`)) {
-        return { manifest, entry, skipped: true };
-    }
-    const value = registerFireForgeModuleTokenized(content, fileName, entry);
-    if (!dryRun) {
-        await writeText(manifestPath, value.result);
-    }
-    return { manifest, entry, previousEntry: value.previousEntry, skipped: false };
-}

package/dist/src/core/register-result.d.ts

@@ -1,30 +0,0 @@
-/**
- * Shared result shape for manifest registration operations, split out of
- * the `manifest-register.ts` barrel so the `register-*` leaf modules can
- * import it without importing the barrel that re-exports them. That
- * type-only back-edge made the registration dependency graph cyclic.
- */
-/**
- * Result of a manifest registration operation.
- */
-export interface RegisterResult {
-    /** The manifest file that was modified */
-    manifest: string;
-    /** The entry that was inserted */
-    entry: string;
-    /** The entry after which the new entry was inserted (for user display) */
-    previousEntry?: string | undefined;
-    /** Whether the entry already existed (skipped) */
-    skipped: boolean;
-    /** Whether --after target was not found and fell back to alphabetical */
-    afterFallback?: boolean | undefined;
-    /**
-     * Manifests created or wired by `--create-manifest` scaffolding
-     * (directory moz.build, parent DIRS chain, XPCSHELL_TESTS_MANIFESTS),
-     * for user display.
-     */
-    scaffoldActions?: {
-        manifest: string;
-        change: string;
-    }[] | undefined;
-}

package/dist/src/core/register-result.js

@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: EUPL-1.2
-/**
- * Shared result shape for manifest registration operations, split out of
- * the `manifest-register.ts` barrel so the `register-*` leaf modules can
- * import it without importing the barrel that re-exports them. That
- * type-only back-edge made the registration dependency graph cyclic.
- */
-export {};

package/dist/src/core/register-scaffold.d.ts

@@ -1,55 +0,0 @@
-/**
- * Manifest scaffolding for `fireforge register --create-manifest`.
- *
- * `register` only inserts into EXISTING manifests, so registering a module
- * under a directory with no moz.build fails with "Manifest not found". This
- * module owns the two scaffolding primitives:
- *
- *  - creating a directory `moz.build` (license header + the requested list
- *    directive) and wiring the parent chain's `DIRS` entries up to the
- *    nearest existing moz.build.
- *  - wiring an `XPCSHELL_TESTS_MANIFESTS` entry for a (possibly freshly
- *    created) `xpcshell.toml` into the nearest existing moz.build.
- *
- * All writers reuse the tokenizer + alphabetical-position helpers the
- * existing register writers use, so inserted entries respect mozbuild's
- * case-insensitive StrictOrderingOnAppendList rule.
- */
-/** One manifest mutation performed (or planned, on dry-run) by a scaffold. */
-export interface ScaffoldAction {
-    /** Engine-relative manifest path that was created or modified. */
-    manifest: string;
-    /** Human-readable description of the change. */
-    change: string;
-}
-/**
- * Inserts `value` into the named moz.build list directive, creating the
- * `NAME += [ ... ]` block at the end of the file when the directive does
- * not exist yet. Returns the updated content, or null when the value is
- * already present.
- */
-export declare function upsertMozBuildListEntry(content: string, directive: string, value: string): string | null;
-/**
- * Ensures every parent directory between `childRelDir` and the nearest
- * existing moz.build carries a `DIRS` entry pointing at the next segment
- * down, creating intermediate moz.build files as needed. Walks upward
- * from the child's parent. Throws when no moz.build exists anywhere up
- * to the engine root (an engine checkout always has one at the root, so
- * this indicates a bogus path).
- */
-export declare function ensureParentDirsWiring(engineDir: string, childRelDir: string, dryRun: boolean): Promise<ScaffoldAction[]>;
-/**
- * Creates `<moduleDir>/moz.build` with an `EXTRA_JS_MODULES.<namespace>`
- * list containing `fileName`, and wires the parent DIRS chain. The
- * namespace is the module directory's basename (the fork's binary name
- * for `browser/modules/<binaryName>/`), matching Firefox's convention of
- * mapping `EXTRA_JS_MODULES.<ns>` into `resource:///modules/<ns>/`.
- */
-export declare function scaffoldModuleMozBuild(engineDir: string, moduleDir: string, fileName: string, dryRun: boolean): Promise<ScaffoldAction[]>;
-/**
- * Wires an `XPCSHELL_TESTS_MANIFESTS` entry for `manifestRelPath` (an
- * engine-relative `.../xpcshell.toml`) into the nearest EXISTING
- * moz.build above it. Returns the performed actions (empty when the
- * entry already exists).
- */
-export declare function ensureXpcshellManifestWiring(engineDir: string, manifestRelPath: string, dryRun: boolean): Promise<ScaffoldAction[]>;

package/dist/src/core/register-scaffold.js

@@ -1,146 +0,0 @@
-// SPDX-License-Identifier: EUPL-1.2
-/**
- * Manifest scaffolding for `fireforge register --create-manifest`.
- *
- * `register` only inserts into EXISTING manifests, so registering a module
- * under a directory with no moz.build fails with "Manifest not found". This
- * module owns the two scaffolding primitives:
- *
- *  - creating a directory `moz.build` (license header + the requested list
- *    directive) and wiring the parent chain's `DIRS` entries up to the
- *    nearest existing moz.build.
- *  - wiring an `XPCSHELL_TESTS_MANIFESTS` entry for a (possibly freshly
- *    created) `xpcshell.toml` into the nearest existing moz.build.
- *
- * All writers reuse the tokenizer + alphabetical-position helpers the
- * existing register writers use, so inserted entries respect mozbuild's
- * case-insensitive StrictOrderingOnAppendList rule.
- */
-import { dirname, join } from 'node:path';
-import { GeneralError } from '../errors/base.js';
-import { pathExists, readText, writeText } from '../utils/fs.js';
-import { normalizePathSlashes } from '../utils/paths.js';
-import { getLicenseHeader } from './license-headers.js';
-import { findAlphabeticalMozBuildPosition } from './moz-manifest-helpers.js';
-import { tokenizeMozBuildList } from './moz-manifest-tokenizers.js';
-/**
- * moz.build files use Firefox's canonical MPL-2.0 hash-comment header
- * regardless of the fork's own project license. They live in the engine
- * tree among upstream MPL files.
- */
-function mozBuildHeader() {
-    return getLicenseHeader('MPL-2.0', 'hash');
-}
-/**
- * Inserts `value` into the named moz.build list directive, creating the
- * `NAME += [ ... ]` block at the end of the file when the directive does
- * not exist yet. Returns the updated content, or null when the value is
- * already present.
- */
-export function upsertMozBuildListEntry(content, directive, value) {
-    if (content.includes(`"${value}"`))
-        return null;
-    const lines = content.split('\n');
-    const listResult = tokenizeMozBuildList(lines, new RegExp(`^${directive}\\b`));
-    if (listResult) {
-        const { insertIndex } = findAlphabeticalMozBuildPosition(listResult.tokens, value);
-        lines.splice(insertIndex, 0, `    "${value}",`);
-        return lines.join('\n');
-    }
-    // No existing list: append a fresh block, keeping exactly one blank
-    // line between the previous content and the new directive.
-    while (lines.length > 0 && (lines.at(-1) ?? '').trim() === '')
-        lines.pop();
-    const block = [`${directive} += [`, `    "${value}",`, `]`];
-    return [...lines, ...(lines.length > 0 ? [''] : []), ...block, ''].join('\n');
-}
-/**
- * Ensures every parent directory between `childRelDir` and the nearest
- * existing moz.build carries a `DIRS` entry pointing at the next segment
- * down, creating intermediate moz.build files as needed. Walks upward
- * from the child's parent. Throws when no moz.build exists anywhere up
- * to the engine root (an engine checkout always has one at the root, so
- * this indicates a bogus path).
- */
-export async function ensureParentDirsWiring(engineDir, childRelDir, dryRun) {
-    const actions = [];
-    let childName = childRelDir.split('/').at(-1) ?? childRelDir;
-    let parentRel = normalizePathSlashes(dirname(childRelDir));
-    for (;;) {
-        if (parentRel === '.' || parentRel === '' || parentRel === '/') {
-            throw new GeneralError(`No moz.build found in any parent of ${childRelDir} up to the engine root; ` +
-                'cannot wire the DIRS chain. Check the path.');
-        }
-        const parentManifestRel = `${parentRel}/moz.build`;
-        const parentManifestPath = join(engineDir, parentManifestRel);
-        if (await pathExists(parentManifestPath)) {
-            const content = await readText(parentManifestPath);
-            const updated = upsertMozBuildListEntry(content, 'DIRS', childName);
-            if (updated !== null) {
-                if (!dryRun)
-                    await writeText(parentManifestPath, updated);
-                actions.push({ manifest: parentManifestRel, change: `DIRS += ["${childName}"]` });
-            }
-            return actions;
-        }
-        // Parent has no moz.build either: scaffold one carrying the DIRS
-        // entry and keep walking up until an existing manifest anchors the
-        // chain.
-        const scaffold = `${mozBuildHeader()}\n\nDIRS += [\n    "${childName}",\n]\n`;
-        if (!dryRun)
-            await writeText(parentManifestPath, scaffold);
-        actions.push({ manifest: parentManifestRel, change: `created with DIRS += ["${childName}"]` });
-        childName = parentRel.split('/').at(-1) ?? parentRel;
-        parentRel = normalizePathSlashes(dirname(parentRel));
-    }
-}
-/**
- * Creates `<moduleDir>/moz.build` with an `EXTRA_JS_MODULES.<namespace>`
- * list containing `fileName`, and wires the parent DIRS chain. The
- * namespace is the module directory's basename (the fork's binary name
- * for `browser/modules/<binaryName>/`), matching Firefox's convention of
- * mapping `EXTRA_JS_MODULES.<ns>` into `resource:///modules/<ns>/`.
- */
-export async function scaffoldModuleMozBuild(engineDir, moduleDir, fileName, dryRun) {
-    const namespace = moduleDir.split('/').at(-1) ?? moduleDir;
-    const manifestRel = `${moduleDir}/moz.build`;
-    const content = `${mozBuildHeader()}\n\nEXTRA_JS_MODULES.${namespace} += [\n    "${fileName}",\n]\n`;
-    if (!dryRun)
-        await writeText(join(engineDir, manifestRel), content);
-    const actions = [
-        {
-            manifest: manifestRel,
-            change: `created with EXTRA_JS_MODULES.${namespace} += ["${fileName}"]`,
-        },
-    ];
-    actions.push(...(await ensureParentDirsWiring(engineDir, moduleDir, dryRun)));
-    return actions;
-}
-/**
- * Wires an `XPCSHELL_TESTS_MANIFESTS` entry for `manifestRelPath` (an
- * engine-relative `.../xpcshell.toml`) into the nearest EXISTING
- * moz.build above it. Returns the performed actions (empty when the
- * entry already exists).
- */
-export async function ensureXpcshellManifestWiring(engineDir, manifestRelPath, dryRun) {
-    let dirRel = normalizePathSlashes(dirname(manifestRelPath));
-    for (;;) {
-        if (dirRel === '.' || dirRel === '' || dirRel === '/') {
-            throw new GeneralError(`No moz.build found in any parent of ${manifestRelPath} up to the engine root; ` +
-                'cannot wire XPCSHELL_TESTS_MANIFESTS. Check the path.');
-        }
-        const mozBuildRel = `${dirRel}/moz.build`;
-        const mozBuildPath = join(engineDir, mozBuildRel);
-        if (await pathExists(mozBuildPath)) {
-            const relEntry = manifestRelPath.slice(dirRel.length + 1);
-            const content = await readText(mozBuildPath);
-            const updated = upsertMozBuildListEntry(content, 'XPCSHELL_TESTS_MANIFESTS', relEntry);
-            if (updated === null)
-                return [];
-            if (!dryRun)
-                await writeText(mozBuildPath, updated);
-            return [{ manifest: mozBuildRel, change: `XPCSHELL_TESTS_MANIFESTS += ["${relEntry}"]` }];
-        }
-        dirRel = normalizePathSlashes(dirname(dirRel));
-    }
-}