@hominis/fireforge 0.18.8 → 0.18.10

package/dist/src/core/patch-lint-ownership.js

@@ -1,13 +1,41 @@
 // SPDX-License-Identifier: EUPL-1.2
 /**
- * Patch ownership resolution for `.sys.mjs` files.
+ * Patch ownership resolution for JS-shaped files.
  *
  * A file is "patch-owned" when it was created by the project's patch
  * queue rather than being an upstream Firefox file that happens to be
- * modified. This module computes the set of patch-owned `.sys.mjs`
- * paths so lint rules can scope enforcement to project code only.
+ * modified. This module computes the set of patch-owned paths so lint
+ * rules can scope enforcement to project code only.
+ *
+ * The two resolvers are kept separate (one per extension predicate)
+ * because the downstream rules differ: `.sys.mjs` files go through
+ * `runCheckJs` (TypeScript checkJs) and the export-walker JSDoc rule;
+ * chrome subscripts (`.js` non-`.sys.mjs`) only get the script-walker
+ * JSDoc rule. Mixing them in a single set would silently broaden
+ * `runCheckJs` to chrome subscripts, which it is not designed for.
  */
 import { collectNewFileCreatorsByPath } from './patch-lint-cross.js';
+/**
+ * Returns the set of patch-owned files matching `predicate`. Internal
+ * helper shared by the per-extension resolvers below.
+ */
+function resolveOwned(currentNewFiles, patchQueueCtx, predicate) {
+    const owned = new Set();
+    for (const file of currentNewFiles) {
+        if (predicate(file)) {
+            owned.add(file);
+        }
+    }
+    if (patchQueueCtx) {
+        const creators = collectNewFileCreatorsByPath(patchQueueCtx);
+        for (const [file, owners] of creators) {
+            if (predicate(file) && owners.length > 0) {
+                owned.add(file);
+            }
+        }
+    }
+    return owned;
+}
 /**
  * Returns the set of file paths that are patch-owned `.sys.mjs` files.
  *
@@ -24,20 +52,19 @@ import { collectNewFileCreatorsByPath } from './patch-lint-cross.js';
  * @returns Set of patch-owned `.sys.mjs` file paths
  */
 export function resolvePatchOwnedSysMjs(currentNewFiles, patchQueueCtx) {
-    const owned = new Set();
-    for (const file of currentNewFiles) {
-        if (file.endsWith('.sys.mjs')) {
-            owned.add(file);
-        }
-    }
-    if (patchQueueCtx) {
-        const creators = collectNewFileCreatorsByPath(patchQueueCtx);
-        for (const [file, owners] of creators) {
-            if (file.endsWith('.sys.mjs') && owners.length > 0) {
-                owned.add(file);
-            }
-        }
-    }
-    return owned;
+    return resolveOwned(currentNewFiles, patchQueueCtx, (file) => file.endsWith('.sys.mjs'));
+}
+/**
+ * Returns the set of file paths that are patch-owned chrome subscripts
+ * (`.js` files that are not `.sys.mjs` modules — typically
+ * `browser/base/content/<binaryName>*.js` and similar). Same ownership
+ * semantics as {@link resolvePatchOwnedSysMjs}.
+ *
+ * @param currentNewFiles - Files newly created in the current diff
+ * @param patchQueueCtx - Optional cross-patch context for queue-wide ownership
+ * @returns Set of patch-owned chrome-subscript file paths
+ */
+export function resolvePatchOwnedChromeScripts(currentNewFiles, patchQueueCtx) {
+    return resolveOwned(currentNewFiles, patchQueueCtx, (file) => file.endsWith('.js') && !file.endsWith('.sys.mjs'));
 }
 //# sourceMappingURL=patch-lint-ownership.js.map

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

@@ -5,7 +5,7 @@ export { runCheckJs } from './patch-lint-checkjs.js';
 export { buildPatchQueueContext, collectNewFileCreatorsByPath, type ExtractedSpecifier, extractImportSpecifiers, extractImportSpecifiersWithLines, findForwardImportIgnoreLines, FORWARD_IMPORT_IGNORE_MARKER, isForwardImportableFile, lintPatchQueue, lintPatchQueueDuplicateCreations, lintPatchQueueForwardImports, type PatchQueueContext, type PatchQueueEntry, } from './patch-lint-cross.js';
 export { buildModifiedFileAdditionsFromDiff, detectNewFilesInDiff } from './patch-lint-diff.js';
 export { type JsDocCheck, type JsDocIssue, validateExportJsDoc } from './patch-lint-jsdoc.js';
-export { resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
+export { resolvePatchOwnedChromeScripts, resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
 /**
  * Counts the total lines in a unified diff and the number of non-binary
  * text lines, so binary hunks do not inflate patch size checks.
@@ -55,9 +55,14 @@ export declare function lintNewFileHeaders(repoDir: string, newFiles: string[],
  * @param newFiles - Set of files that are newly created in this patch
  * @param config - Project configuration
  * @param patchOwnedFiles - Optional set of patch-owned `.sys.mjs` paths for scoped JSDoc enforcement
+ * @param patchOwnedChromeScripts - Optional set of patch-owned chrome
+ *   subscripts (`.js` non-`.sys.mjs`) for scoped chrome-script JSDoc
+ *   enforcement. Built by {@link resolvePatchOwnedChromeScripts}; passed
+ *   separately from `patchOwnedFiles` so the `runCheckJs` consumer (which
+ *   only accepts `.sys.mjs`) is not silently broadened.
  * @returns Array of lint issues
  */
-export declare function lintPatchedJs(repoDir: string, affectedFiles: string[], newFiles: Set<string>, config: FireForgeConfig, patchOwnedFiles?: Set<string>): Promise<PatchLintIssue[]>;
+export declare function lintPatchedJs(repoDir: string, affectedFiles: string[], newFiles: Set<string>, config: FireForgeConfig, patchOwnedFiles?: Set<string>, patchOwnedChromeScripts?: Set<string>): Promise<PatchLintIssue[]>;
 /**
  * Checks that modifications to existing (non-new) JS/MJS files include at
  * least one `// BINARYNAME:` comment in the added lines.

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

@@ -7,10 +7,11 @@ import { hasRawCssColors, stripJsComments } from '../utils/regex.js';
 import { loadFurnaceConfig } from './furnace-config.js';
 import { containsUpstreamLicenseText, getLicenseHeader, hasAnyLicenseHeader, hasAnyLicenseHeaderAnyStyle, } from './license-headers.js';
 import { runCheckJs } from './patch-lint-checkjs.js';
+import { lintChromeScriptJsDocForFile } from './patch-lint-chrome-jsdoc.js';
 import { detectNewFilesInDiff, extractAddedLinesPerFile } from './patch-lint-diff.js';
 import { AGGREGATE_PATCH_FILE } from './patch-lint-diff-tag.js';
 import { validateExportJsDoc } from './patch-lint-jsdoc.js';
-import { resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
+import { resolvePatchOwnedChromeScripts, resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
 // ---------------------------------------------------------------------------
 // Cross-patch lint re-exports
 // ---------------------------------------------------------------------------
@@ -24,7 +25,7 @@ export { runCheckJs } from './patch-lint-checkjs.js';
 export { buildPatchQueueContext, collectNewFileCreatorsByPath, extractImportSpecifiers, extractImportSpecifiersWithLines, findForwardImportIgnoreLines, FORWARD_IMPORT_IGNORE_MARKER, isForwardImportableFile, lintPatchQueue, lintPatchQueueDuplicateCreations, lintPatchQueueForwardImports, } from './patch-lint-cross.js';
 export { buildModifiedFileAdditionsFromDiff, detectNewFilesInDiff } from './patch-lint-diff.js';
 export { validateExportJsDoc } from './patch-lint-jsdoc.js';
-export { resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
+export { resolvePatchOwnedChromeScripts, resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -403,9 +404,14 @@ export async function lintNewFileHeaders(repoDir, newFiles, config) {
  * @param newFiles - Set of files that are newly created in this patch
  * @param config - Project configuration
  * @param patchOwnedFiles - Optional set of patch-owned `.sys.mjs` paths for scoped JSDoc enforcement
+ * @param patchOwnedChromeScripts - Optional set of patch-owned chrome
+ *   subscripts (`.js` non-`.sys.mjs`) for scoped chrome-script JSDoc
+ *   enforcement. Built by {@link resolvePatchOwnedChromeScripts}; passed
+ *   separately from `patchOwnedFiles` so the `runCheckJs` consumer (which
+ *   only accepts `.sys.mjs`) is not silently broadened.
  * @returns Array of lint issues
  */
-export async function lintPatchedJs(repoDir, affectedFiles, newFiles, config, patchOwnedFiles) {
+export async function lintPatchedJs(repoDir, affectedFiles, newFiles, config, patchOwnedFiles, patchOwnedChromeScripts) {
     const jsFiles = affectedFiles.filter(isJsFile);
     if (jsFiles.length === 0)
         return [];
@@ -476,9 +482,20 @@ export async function lintPatchedJs(repoDir, affectedFiles, newFiles, config, pa
                 });
             }
         }
-        // 3b. Assertion floor for patch-introduced browser-chrome tests
+        // 3a. JSDoc on top-level declarations in patch-owned chrome subscripts.
+        // Dispatched out-of-line to keep this file under the per-file line
+        // budget. See `patch-lint-chrome-jsdoc.ts` for the rule body.
+        const isChromeOwned = file.endsWith('.js') &&
+            !isSysMjs &&
+            (patchOwnedChromeScripts ? patchOwnedChromeScripts.has(file) : isNew);
+        const chromeMode = config.patchLint?.chromeScriptJsDoc;
+        issues.push(...lintChromeScriptJsDocForFile(file, content, isChromeOwned, chromeMode));
+        // 3b. Assertion floor for browser-chrome tests touched by this patch
+        // (covers both newly introduced files and modified upstream tests —
+        // a patch that strips the last `Assert.equal` from an existing
+        // browser_*.js silently passed under the old `isNew` gate).
         const assertionFloor = config.patchLint?.testAssertionFloor;
-        if (assertionFloor && assertionFloor !== 'off' && isNew && isBrowserChromeTestFile(file)) {
+        if (assertionFloor && assertionFloor !== 'off' && isBrowserChromeTestFile(file)) {
             const ASSERTION_TOKENS = ['Assert.', 'ok(', 'is(', 'isnot(', 'isDeeply('];
             const hasAssertion = ASSERTION_TOKENS.some((tok) => strippedContent.includes(tok));
             if (!hasAssertion) {
@@ -703,10 +720,11 @@ export async function lintExportedPatch(repoDir, affectedFiles, diffContent, con
     const newFiles = detectNewFilesInDiff(diffContent);
     const { textLines: lineCount } = countNonBinaryDiffLines(diffContent);
     const patchOwnedFiles = resolvePatchOwnedSysMjs(newFiles, patchQueueCtx);
+    const patchOwnedChromeScripts = resolvePatchOwnedChromeScripts(newFiles, patchQueueCtx);
     const [cssIssues, headerIssues, jsIssues, modifiedHeaderIssues] = await Promise.all([
         lintPatchedCss(repoDir, affectedFiles, diffContent, config),
         lintNewFileHeaders(repoDir, [...newFiles], config),
-        lintPatchedJs(repoDir, affectedFiles, newFiles, config, patchOwnedFiles),
+        lintPatchedJs(repoDir, affectedFiles, newFiles, config, patchOwnedFiles, patchOwnedChromeScripts),
         lintModifiedFileHeaders(repoDir, affectedFiles, newFiles),
     ]);
     const modCommentIssues = lintModificationComments(diffContent, config);

package/dist/src/types/commands/index.d.ts

@@ -1,6 +1,6 @@
 /**
  * Re-exports all command-related types from focused sub-modules.
  */
-export type { BuildOptions, DiscardOptions, DoctorOptions, DownloadOptions, ExportOptions, FurnaceApplyOptions, FurnaceCreateOptions, FurnaceDeployOptions, FurnaceOverrideOptions, FurnacePreviewOptions, FurnaceRefreshOptions, FurnaceRemoveOptions, FurnaceSyncOptions, FurnaceValidateOptions, GlobalOptions, ImportOptions, PackageOptions, PatchCompactOptions, PatchDeleteOptions, PatchLintIgnoreOptions, PatchReorderOptions, PatchTierOptions, RebaseOptions, ReExportOptions, RegisterOptions, ResetOptions, RunOptions, SetupOptions, StatusOptions, TestOptions, TokenAddOptions, WireOptions, } from './options.js';
+export type { BuildOptions, DiscardOptions, DoctorOptions, DownloadOptions, ExportOptions, FurnaceApplyOptions, FurnaceCreateOptions, FurnaceDeployOptions, FurnaceOverrideOptions, FurnacePreviewOptions, FurnaceRefreshOptions, FurnaceRemoveOptions, FurnaceSyncOptions, FurnaceValidateOptions, GlobalOptions, ImportOptions, PackageOptions, PatchCompactOptions, PatchDeleteOptions, PatchLintIgnoreOptions, PatchRenameOptions, PatchReorderOptions, PatchTierOptions, RebaseOptions, ReExportOptions, RegisterOptions, ResetOptions, RunOptions, SetupOptions, StatusOptions, TestOptions, TokenAddOptions, WireOptions, } from './options.js';
 export type { ImportSummary, PatchCategory, PatchesManifest, PatchInfo, PatchLintIssue, PatchMetadata, PatchResult, } from './patches.js';
 export type { DoctorCheck, ProjectStatus, TokenCoverageFileEntry, TokenCoverageReport, } from './project.js';

package/dist/src/types/commands/options.d.ts

@@ -316,6 +316,14 @@ export interface TestOptions {
      * values appear after `--headless` if both are set.
      */
     machArg?: string[];
+    /**
+     * Override the Marionette control port (default 2828) used by the
+     * stale-browser probe, the `--doctor` preflight, and the auto-forwarded
+     * `--setpref=marionette.port=<n>` arg passed to mach. Set this when a
+     * stale process holds the default port and `kill` is not an option, or
+     * when a CI runner reserves a different port for parallel test runs.
+     */
+    marionettePort?: number;
 }
 /**
  * Options for the furnace apply command.
@@ -493,6 +501,34 @@ export interface PatchDeleteOptions {
     /** Bypass the hard refusal when later patches depend on the target. */
     forceUnsafe?: boolean;
 }
+/**
+ * Options for the `fireforge patch rename` subcommand. Updates the
+ * patch's filename, manifest `name`, and (optionally) `description`
+ * atomically without rewriting the `.patch` file body. Companion to
+ * `re-export --files` for the case where the body is already correct
+ * but the patch's identity (filename + description) describes a
+ * pre-shrink scope; before this verb existed the only workaround was
+ * `delete` + re-export, which briefly dropped the patch from the queue.
+ */
+export interface PatchRenameOptions {
+    /**
+     * New human-readable name. Sanitised the same way `export --name`
+     * sanitises into the filename slug (lowercase, non-alphanumerics
+     * collapsed to `-`, length-capped). The patch's `name` field stores
+     * the raw value; the filename uses the sanitised slug.
+     */
+    to?: string;
+    /**
+     * Replacement description. Omit to leave the description unchanged
+     * (intentional — operators frequently want to relabel the slug
+     * without touching the description).
+     */
+    description?: string;
+    /** Print the planned change without writing. */
+    dryRun?: boolean;
+    /** Skip the confirmation prompt (required for non-TTY). */
+    yes?: boolean;
+}
 /**
  * Options for the patch reorder command.
  */

package/dist/src/types/config.d.ts

@@ -74,8 +74,19 @@ export interface PatchLintConfig {
     rawColorAllowlist?: string[];
     /** Enforce JSDoc on class-method exports in patch-owned .sys.mjs files. Default: 'off'. */
     jsdocClassMethods?: PatchLintSeverityGate;
-    /** Require ≥1 assertion in patch-introduced browser_*.js test files. Default: 'off'. */
+    /** Require ≥1 assertion in any patch-touched browser_*.js test file (new or modified). Default: 'off'. */
     testAssertionFloor?: PatchLintSeverityGate;
+    /**
+     * Enforce JSDoc on top-level classes (and their methods) and functions
+     * in patch-owned chrome subscripts (`.js` files loaded via
+     * `Services.scriptloader.loadSubScript`, e.g.
+     * `browser/base/content/<binaryName>*.js`). Distinct from
+     * `jsdocClassMethods` because chrome subscripts are parsed as scripts,
+     * not ES modules — using one flag for both would silently disable the
+     * rule when a chrome subscript was fed to the module parser. Default:
+     * 'off'.
+     */
+    chromeScriptJsDoc?: PatchLintSeverityGate;
 }
 /**
  * Build mode for mach.

package/package.json

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