@hominis/fireforge 0.18.2 → 0.18.5

package/dist/src/core/register-shared-css.js

@@ -83,11 +83,68 @@ function legacyRegisterSharedCSS(content, name, entry, after) {
     lines.splice(insertIndex, 0, entry);
     return { result: lines.join('\n'), previousEntry, afterFallback };
 }
+/** Minimum gap between the target path and the source parenthesis. */
+const MIN_SOURCE_GAP = 4;
+/**
+ * Measures the column at which the `(source)` parenthesis opens in
+ * adjacent `skin/classic/browser/<x>.css (...)` entries inside an
+ * existing jar.inc.mn body, and returns the maximum so a newly inserted
+ * entry can align its source column to match.
+ *
+ * 2026-04-26 eval Finding 3: pre-fix `registerSharedCSS` always emitted
+ * a four-space gap between the target path and the parenthesis,
+ * regardless of how the rest of the file was aligned. Adjacent Firefox
+ * entries are typically padded to a wider column, so a freshly
+ * registered file landed at the wrong column and produced avoidable
+ * formatting churn. Returns `undefined` when no existing entries
+ * provide an alignment signal — callers fall back to the four-space
+ * default in that case.
+ */
+export function measureSourceColumn(content) {
+    const lines = content.split('\n');
+    let maxColumn = 0;
+    let sampled = 0;
+    // The regex guarantees `(` appears in the matched line, so the index
+    // lookup below is always >= 0. The `match` body's leading-whitespace
+    // and target-path captures are likewise guaranteed by the pattern, so
+    // we can take the literal `match[0]` (full match) length minus one to
+    // locate the `(` column without a fragile per-group lookup.
+    const lineRe = /^\s*skin\/classic\/browser\/[^\s()]+\s+\(/;
+    for (const line of lines) {
+        const match = lineRe.exec(line);
+        if (!match)
+            continue;
+        const parenIndex = match[0].length - 1;
+        if (parenIndex > maxColumn)
+            maxColumn = parenIndex;
+        sampled++;
+    }
+    return sampled > 0 ? maxColumn : undefined;
+}
+/**
+ * Builds a `skin/classic/browser/<name>.css   (../shared/<name>.css)`
+ * line padded so the parenthesis lands at {@link sourceColumn} (when
+ * supplied) or at the default four-space gap (when {@link sourceColumn}
+ * is `undefined` or would force the parenthesis closer to the target
+ * than {@link MIN_SOURCE_GAP}).
+ */
+export function buildEntry(name, sourceColumn) {
+    const indent = '  ';
+    const target = `${indent}skin/classic/browser/${name}.css`;
+    const minColumn = target.length + MIN_SOURCE_GAP;
+    const column = sourceColumn !== undefined && sourceColumn >= minColumn ? sourceColumn : minColumn;
+    const padding = ' '.repeat(column - target.length);
+    return `${target}${padding}(../shared/${name}.css)`.replace(/\\/g, '/');
+}
 /**
  * Registers a CSS file in browser/themes/shared/jar.inc.mn.
  *
  * Entry format:
  *   skin/classic/browser/{name}.css    (../shared/{name}.css)
+ *
+ * The gap between target and source is sized to align with adjacent
+ * entries when the manifest already uses a wider column; falls back to
+ * a four-space minimum otherwise.
  */
 export async function registerSharedCSS(engineDir, fileName, after, dryRun = false) {
     const manifest = 'browser/themes/shared/jar.inc.mn';
@@ -96,10 +153,17 @@ export async function registerSharedCSS(engineDir, fileName, after, dryRun = fal
         throw new GeneralError(`Manifest not found: ${manifest}`);
     }
     const name = basename(fileName, '.css');
-    const entry = `  skin/classic/browser/${name}.css    (../shared/${name}.css)`.replace(/\\/g, '/');
     const content = await readText(manifestPath);
-    // Idempotency check
-    if (content.includes(`skin/classic/browser/${name}.css`)) {
+    const sourceColumn = measureSourceColumn(content);
+    const entry = buildEntry(name, sourceColumn);
+    // Idempotency check. `furnace chrome-doc create` writes its CSS as a
+    // `content/browser/<name>.css` entry rather than the canonical
+    // `skin/classic/browser/<name>.css` form `register` produces; recognise
+    // both shapes so a follow-up `register` invocation against an
+    // already-chrome-doc-registered file reports `skipped` instead of
+    // appending a duplicate `skin/classic/browser/...` row.
+    if (content.includes(`skin/classic/browser/${name}.css`) ||
+        content.includes(`content/browser/${name}.css`)) {
         return { manifest, entry, skipped: true };
     }
     const { value } = withParserFallback(() => registerSharedCSSTokenized(content, name, entry, after), () => legacyRegisterSharedCSS(content, name, entry, after), manifest);

package/package.json

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