@hominis/fireforge 0.27.3 → 0.28.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.28.0
+
+- Added the product-resolved Firefox source archive URL to `source set` output so pinned checksums can be verified against the exact archive target before download.
+- Fixed re-export serialization so blank context lines keep their unified-diff context marker, preventing FireForge-generated patches from producing false patch-owned drift warnings during `verify`.
+- Fixed partial `re-export` manifest writes so legacy source metadata is preserved on unselected patch rows unless `--stamp` or another source metadata update explicitly targets them.
+- Added regression coverage for targeted and full stamped re-export round-trips with blank context lines.
+
 ## 0.27.3
 
 - Fixed `firefox-devedition` source downloads so archive resolution uses `/pub/devedition/releases`.

package/dist/src/commands/source.js

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: EUPL-1.2
 import { Option } from 'commander';
 import { configExists, loadRawConfigDocument, validateConfig, withConfigFileLock, writeConfigDocument, } from '../core/config.js';
+import { resolveArchive } from '../core/firefox-archive.js';
 import { GeneralError, InvalidArgumentError } from '../errors/base.js';
 import { info, intro, outro, success } from '../utils/logger.js';
 import { isValidFirefoxProduct } from '../utils/validation.js';
@@ -57,8 +58,10 @@ export async function sourceSetCommand(projectRoot, options) {
         await writeConfigDocument(projectRoot, updated);
         return validated.firefox;
     });
+    const archive = resolveArchive(written.version, written.product);
     success(`Set firefox.version = ${written.version}`);
     success(`Set firefox.product = ${written.product}`);
+    success(`Resolved source URL: ${archive.url}`);
     if (written.sha256 !== undefined) {
         success(`Set firefox.sha256 = ${written.sha256}`);
     }

package/dist/src/core/patch-artifact-normalize.d.ts

@@ -1,9 +1,9 @@
 /**
- * Normalizes generated patch files for repository whitespace checks.
+ * Normalizes generated patch files before they are written to disk.
  *
- * Unified diffs conventionally encode a blank context line as a physical line
- * containing one space. `git apply` also accepts the same hunk as an empty
- * physical line, while repository-level `git diff --check` flags the
- * single-space artifact as trailing whitespace in `patches/*.patch`.
+ * Kept as a narrow chokepoint for future artifact-level fixes. It must not
+ * rewrite hunk body lines: unified diffs encode a blank context line as a
+ * physical line containing the leading context marker (`" "`), and FireForge's
+ * verifier relies on that marker when replaying patch output.
  */
 export declare function normalizePatchArtifact(content: string): string;

package/dist/src/core/patch-artifact-normalize.js

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: EUPL-1.2
 /**
- * Normalizes generated patch files for repository whitespace checks.
+ * Normalizes generated patch files before they are written to disk.
  *
- * Unified diffs conventionally encode a blank context line as a physical line
- * containing one space. `git apply` also accepts the same hunk as an empty
- * physical line, while repository-level `git diff --check` flags the
- * single-space artifact as trailing whitespace in `patches/*.patch`.
+ * Kept as a narrow chokepoint for future artifact-level fixes. It must not
+ * rewrite hunk body lines: unified diffs encode a blank context line as a
+ * physical line containing the leading context marker (`" "`), and FireForge's
+ * verifier relies on that marker when replaying patch output.
  */
 export function normalizePatchArtifact(content) {
-    return content.replace(/^ $/gm, '');
+    return content;
 }
 //# sourceMappingURL=patch-artifact-normalize.js.map

package/dist/src/core/patch-export-metadata.js

@@ -3,27 +3,7 @@
  * Manifest metadata mutation helpers for patch export commands.
  */
 import { withPatchDirectoryLock } from './patch-apply.js';
-import { loadPatchesManifest, savePatchesManifest } from './patch-manifest.js';
-/**
- * Merges `updates` onto `existing` and removes the listed optional fields.
- */
-function applyMetadataUpdate(existing, updates, unset) {
-    const next = { ...existing, ...updates };
-    for (const field of unset) {
-        switch (field) {
-            case 'tier':
-                delete next.tier;
-                break;
-            case 'lintIgnore':
-                delete next.lintIgnore;
-                break;
-            case 'stagedDependencies':
-                delete next.stagedDependencies;
-                break;
-        }
-    }
-    return next;
-}
+import { mutatePatchRowsInManifest } from './patch-manifest.js';
 /**
  * Updates metadata for a patch in the manifest.
  *
@@ -34,17 +14,10 @@ function applyMetadataUpdate(existing, updates, unset) {
  */
 export async function updatePatchMetadata(patchesDir, filename, updates, unsetFields = []) {
     await withPatchDirectoryLock(patchesDir, async () => {
-        const manifest = await loadPatchesManifest(patchesDir);
-        if (!manifest)
-            return;
-        const patchIndex = manifest.patches.findIndex((p) => p.filename === filename);
-        if (patchIndex === -1)
-            return;
-        const existingPatch = manifest.patches[patchIndex];
-        if (existingPatch) {
-            manifest.patches[patchIndex] = applyMetadataUpdate(existingPatch, updates, unsetFields);
-            await savePatchesManifest(patchesDir, manifest);
-        }
+        await mutatePatchRowsInManifest(patchesDir, [filename], () => ({
+            set: updates,
+            unset: unsetFields,
+        }));
     });
 }
 /**
@@ -53,20 +26,14 @@ export async function updatePatchMetadata(patchesDir, filename, updates, unsetFi
  */
 export async function mutatePatchMetadata(patchesDir, filename, mutator) {
     return await withPatchDirectoryLock(patchesDir, async () => {
-        const manifest = await loadPatchesManifest(patchesDir);
-        if (!manifest)
-            return null;
-        const patchIndex = manifest.patches.findIndex((p) => p.filename === filename);
-        if (patchIndex === -1)
-            return null;
-        const existingPatch = manifest.patches[patchIndex];
-        if (!existingPatch)
+        const result = await mutatePatchRowsInManifest(patchesDir, [filename], (existing) => {
+            const { set = {}, unset = [] } = mutator(existing);
+            return { set, unset };
+        });
+        const changed = result?.[0];
+        if (!changed)
             return null;
-        const { set = {}, unset = [] } = mutator(existingPatch);
-        const updatedPatch = applyMetadataUpdate(existingPatch, set, unset);
-        manifest.patches[patchIndex] = updatedPatch;
-        await savePatchesManifest(patchesDir, manifest);
-        return { before: existingPatch, after: updatedPatch };
+        return { before: changed.before, after: changed.after };
     });
 }
 //# sourceMappingURL=patch-export-metadata.js.map

package/dist/src/core/patch-export-update.js

@@ -5,7 +5,7 @@ import { pathExists, readText, writeText } from '../utils/fs.js';
 import { warn } from '../utils/logger.js';
 import { withPatchDirectoryLock } from './patch-apply.js';
 import { normalizePatchArtifact } from './patch-artifact-normalize.js';
-import { loadPatchesManifest, savePatchesManifest } from './patch-manifest.js';
+import { loadPatchesManifest, mutatePatchRowsInManifest } from './patch-manifest.js';
 import { buildProjectedManifest, enforcePatchPolicy } from './patch-policy.js';
 /**
  * Updates a patch file body and its manifest row under the same patch
@@ -41,7 +41,7 @@ export async function updatePatchAndMetadata(patchesDir, filename, newContent, u
         try {
             await writeText(patchPath, normalizePatchArtifact(newContent));
             patchWritten = true;
-            await savePatchesManifest(patchesDir, manifest);
+            await mutatePatchRowsInManifest(patchesDir, [filename], () => ({ set: updates }));
         }
         catch (error) {
             if (patchWritten) {

package/dist/src/core/patch-manifest-io.d.ts

@@ -16,6 +16,20 @@ export interface LoadedManifestState {
     manifest: PatchesManifest | null;
     parseError: Error | undefined;
 }
+/** Field-level mutation returned by a row-scoped manifest mutator. */
+export interface PatchManifestRowMutation {
+    /** Metadata fields to set on the selected manifest row. */
+    set?: Partial<PatchMetadata>;
+    /** Metadata fields to delete from the selected manifest row. */
+    unset?: ReadonlyArray<string>;
+}
+/** Result for one manifest row changed by {@link mutatePatchRowsInManifest}. */
+export interface PatchManifestRowMutationResult {
+    /** Validated row before the mutation. */
+    before: PatchMetadata;
+    /** Validated row after the mutation. */
+    after: PatchMetadata;
+}
 /**
  * Loads and validates the patches manifest, returning full state information.
  * @param patchesDir - Path to the patches directory
@@ -33,6 +47,13 @@ export declare function loadPatchesManifest(patchesDir: string): Promise<Patches
  * @param manifest - Manifest to save
  */
 export declare function savePatchesManifest(patchesDir: string, manifest: PatchesManifest): Promise<void>;
+/**
+ * Mutates selected manifest rows while preserving the raw JSON shape of every
+ * untouched row. This avoids serializing reader-only fallback fields, such as
+ * `sourceVersion` derived from legacy `sourceEsrVersion`, into unrelated patch
+ * entries during partial metadata updates.
+ */
+export declare function mutatePatchRowsInManifest(patchesDir: string, filenames: readonly string[], mutator: (existing: PatchMetadata, rawExisting: Readonly<Record<string, unknown>>) => PatchManifestRowMutation | null): Promise<PatchManifestRowMutationResult[] | null>;
 /**
  * Adds or updates a patch entry in the manifest.
  * @param patchesDir - Path to the patches directory

package/dist/src/core/patch-manifest-io.js

@@ -15,6 +15,7 @@ import { ExitCode } from '../errors/codes.js';
 import { toError } from '../utils/errors.js';
 import { pathExists, readJson, removeFile, writeJson } from '../utils/fs.js';
 import { warn } from '../utils/logger.js';
+import { isArray, isObject } from '../utils/validation.js';
 import { validatePatchesManifest } from './patch-manifest-validate.js';
 /** Filename for the patches manifest */
 export const PATCHES_MANIFEST = 'patches.json';
@@ -61,6 +62,62 @@ export async function savePatchesManifest(patchesDir, manifest) {
     const manifestPath = join(patchesDir, PATCHES_MANIFEST);
     await writeJson(manifestPath, manifest);
 }
+/**
+ * Mutates selected manifest rows while preserving the raw JSON shape of every
+ * untouched row. This avoids serializing reader-only fallback fields, such as
+ * `sourceVersion` derived from legacy `sourceEsrVersion`, into unrelated patch
+ * entries during partial metadata updates.
+ */
+export async function mutatePatchRowsInManifest(patchesDir, filenames, mutator) {
+    const manifestPath = join(patchesDir, PATCHES_MANIFEST);
+    if (!(await pathExists(manifestPath)))
+        return null;
+    const rawManifest = await readJson(manifestPath);
+    const beforeManifest = validatePatchesManifest(rawManifest);
+    if (!isObject(rawManifest) || !isArray(rawManifest['patches'])) {
+        throw new Error('patches.json must be a JSON object with a patches array');
+    }
+    const filenameSet = new Set(filenames);
+    if (filenameSet.size === 0)
+        return [];
+    const rawPatches = rawManifest['patches'].map((entry) => {
+        if (!isObject(entry)) {
+            throw new Error('patches.json patches entries must be objects');
+        }
+        return { ...entry };
+    });
+    const changedIndexes = [];
+    for (const [index, rawPatch] of rawPatches.entries()) {
+        const filename = rawPatch['filename'];
+        if (typeof filename !== 'string' || !filenameSet.has(filename))
+            continue;
+        const existing = beforeManifest.patches[index];
+        if (!existing)
+            continue;
+        const mutation = mutator(existing, rawPatch);
+        if (!mutation)
+            continue;
+        for (const [field, value] of Object.entries(mutation.set ?? {})) {
+            rawPatch[field] = value;
+        }
+        for (const field of mutation.unset ?? []) {
+            rawPatch[field] = undefined;
+        }
+        changedIndexes.push(index);
+    }
+    if (changedIndexes.length === 0)
+        return [];
+    const nextRawManifest = {
+        ...rawManifest,
+        patches: rawPatches,
+    };
+    const afterManifest = validatePatchesManifest(nextRawManifest);
+    await writeJson(manifestPath, nextRawManifest);
+    return changedIndexes.map((index) => ({
+        before: beforeManifest.patches[index],
+        after: afterManifest.patches[index],
+    }));
+}
 /**
  * Adds or updates a patch entry in the manifest.
  * @param patchesDir - Path to the patches directory

package/dist/src/core/patch-manifest-query.js

@@ -5,7 +5,7 @@
 import { readText } from '../utils/fs.js';
 import { fileExistsInHead } from './git-file-ops.js';
 import { discoverPatches, getAllTargetFilesFromPatch } from './patch-files.js';
-import { loadPatchesManifest, savePatchesManifest } from './patch-manifest-io.js';
+import { loadPatchesManifest, mutatePatchRowsInManifest } from './patch-manifest-io.js';
 import { isNewFileInPatch } from './patch-parse.js';
 /**
  * Gets all file paths claimed by patches other than the excluded one.
@@ -106,27 +106,19 @@ export async function validatePatchIntegrity(patchesDir, engineDir) {
  * @param newVersion - Version string to set (e.g. "140.9.0esr")
  */
 export async function stampPatchVersions(patchesDir, filenames, newVersion, newProduct) {
-    const manifest = await loadPatchesManifest(patchesDir);
-    if (!manifest)
-        return;
-    const filenameSet = new Set(filenames);
-    let modified = false;
-    for (const patch of manifest.patches) {
-        if (!filenameSet.has(patch.filename))
-            continue;
+    await mutatePatchRowsInManifest(patchesDir, filenames, (patch, rawPatch) => {
         if (patch.sourceEsrVersion !== newVersion ||
-            patch.sourceVersion !== newVersion ||
-            (newProduct !== undefined && patch.sourceProduct !== newProduct)) {
-            patch.sourceEsrVersion = newVersion;
-            patch.sourceVersion = newVersion;
-            if (newProduct !== undefined) {
-                patch.sourceProduct = newProduct;
-            }
-            modified = true;
+            rawPatch['sourceVersion'] !== newVersion ||
+            (newProduct !== undefined && rawPatch['sourceProduct'] !== newProduct)) {
+            return {
+                set: {
+                    sourceEsrVersion: newVersion,
+                    sourceVersion: newVersion,
+                    ...(newProduct !== undefined ? { sourceProduct: newProduct } : {}),
+                },
+            };
         }
-    }
-    if (modified) {
-        await savePatchesManifest(patchesDir, manifest);
-    }
+        return null;
+    });
 }
 //# sourceMappingURL=patch-manifest-query.js.map

package/dist/src/core/patch-manifest.d.ts

@@ -5,7 +5,7 @@
  * is an implementation detail.
  */
 export { rebuildPatchesManifest, validatePatchesManifestConsistency, } from './patch-manifest-consistency.js';
-export { addPatchToManifest, loadPatchesManifest, PATCHES_MANIFEST, type PatchRenameEntry, removePatchFileAndManifest, renumberPatchesInManifest, savePatchesManifest, } from './patch-manifest-io.js';
+export { addPatchToManifest, loadPatchesManifest, mutatePatchRowsInManifest, PATCHES_MANIFEST, type PatchManifestRowMutation, type PatchManifestRowMutationResult, type PatchRenameEntry, removePatchFileAndManifest, renumberPatchesInManifest, savePatchesManifest, } from './patch-manifest-io.js';
 export { checkVersionCompatibility, findPatchesAffectingFile, getClaimedFiles, stampPatchVersions, validatePatchIntegrity, } from './patch-manifest-query.js';
 export { resolvePatchIdentifier } from './patch-manifest-resolve.js';
 export { validatePatchesManifest } from './patch-manifest-validate.js';

package/dist/src/core/patch-manifest.js

@@ -6,7 +6,7 @@
  * is an implementation detail.
  */
 export { rebuildPatchesManifest, validatePatchesManifestConsistency, } from './patch-manifest-consistency.js';
-export { addPatchToManifest, loadPatchesManifest, PATCHES_MANIFEST, removePatchFileAndManifest, renumberPatchesInManifest, savePatchesManifest, } from './patch-manifest-io.js';
+export { addPatchToManifest, loadPatchesManifest, mutatePatchRowsInManifest, PATCHES_MANIFEST, removePatchFileAndManifest, renumberPatchesInManifest, savePatchesManifest, } from './patch-manifest-io.js';
 export { checkVersionCompatibility, findPatchesAffectingFile, getClaimedFiles, stampPatchVersions, validatePatchIntegrity, } from './patch-manifest-query.js';
 export { resolvePatchIdentifier } from './patch-manifest-resolve.js';
 export { validatePatchesManifest } from './patch-manifest-validate.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.27.3",
+  "version": "0.28.1",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",