@zenithbuild/cli 0.6.5 → 0.6.7

package/dist/build.js

@@ -10,7 +10,6 @@
 // The CLI does not inspect IR fields and does not write output files.
 // The bundler owns all asset and HTML emission.
 // ---------------------------------------------------------------------------
-
 import { spawn, spawnSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { mkdir, readdir, rm, stat } from 'node:fs/promises';
@@ -21,11 +20,10 @@ import { buildComponentRegistry, expandComponents, extractTemplate, isDocumentMo
 import { collectExpandedComponentOccurrences } from './component-occurrences.js';
 import { applyOccurrenceRewritePlans, cloneComponentIrForInstance } from './component-instance-ir.js';
 import { resolveBundlerBin, resolveCompilerBin } from './toolchain-paths.js';
+import { createBundlerToolchain, createCompilerToolchain, ensureToolchainCompatibility, getActiveToolchainCandidate, runToolchainSync } from './toolchain-runner.js';
 import { maybeWarnAboutZenithVersionMismatch } from './version-check.js';
-
 const require = createRequire(import.meta.url);
 let cachedTypeScript = undefined;
-
 /**
  * @returns {import('typescript') | null}
  */
@@ -33,13 +31,13 @@ function loadTypeScriptApi() {
     if (cachedTypeScript === undefined) {
         try {
             cachedTypeScript = require('typescript');
-        } catch {
+        }
+        catch {
             cachedTypeScript = null;
         }
     }
     return cachedTypeScript;
 }
-
 /**
  * Build a per-build warning emitter that deduplicates repeated compiler lines.
  *
@@ -57,7 +55,6 @@ export function createCompilerWarningEmitter(sink = (line) => console.warn(line)
         sink(text);
     };
 }
-
 /**
  * Forward child-process output line-by-line through the structured logger.
  *
@@ -86,7 +83,6 @@ function forwardStreamLines(stream, onLine) {
         }
     });
 }
-
 /**
  * Run the compiler process and parse its JSON stdout.
  *
@@ -99,11 +95,18 @@ function forwardStreamLines(stream, onLine) {
  * @param {object} compilerRunOptions
  * @param {(warning: string) => void} [compilerRunOptions.onWarning]
  * @param {boolean} [compilerRunOptions.suppressWarnings]
- * @param {string} [compilerRunOptions.compilerBin]
+ * @param {string|object} [compilerRunOptions.compilerBin]
+ * @param {object} [compilerRunOptions.compilerToolchain]
  * @returns {object}
  */
 function runCompiler(filePath, stdinSource, compilerOpts = {}, compilerRunOptions = {}) {
-    const compilerBin = compilerRunOptions.compilerBin || resolveCompilerBin();
+    const compilerToolchain = compilerRunOptions.compilerToolchain
+        || (compilerRunOptions.compilerBin && typeof compilerRunOptions.compilerBin === 'object'
+            ? compilerRunOptions.compilerBin
+            : null);
+    const compilerBin = !compilerToolchain && typeof compilerRunOptions.compilerBin === 'string'
+        ? compilerRunOptions.compilerBin
+        : resolveCompilerBin();
     const args = stdinSource !== undefined
         ? ['--stdin', filePath]
         : [filePath];
@@ -117,18 +120,19 @@ function runCompiler(filePath, stdinSource, compilerOpts = {}, compilerRunOption
     if (stdinSource !== undefined) {
         opts.input = stdinSource;
     }
-
-    const result = spawnSync(compilerBin, args, opts);
-
+    const result = compilerToolchain
+        ? runToolchainSync(compilerToolchain, args, opts).result
+        : (compilerBin
+            ? spawnSync(compilerBin, args, opts)
+            : runToolchainSync(createCompilerToolchain({
+                logger: compilerRunOptions.logger || null
+            }), args, opts).result);
     if (result.error) {
         throw new Error(`Compiler spawn failed for ${filePath}: ${result.error.message}`);
     }
     if (result.status !== 0) {
-        throw new Error(
-            `Compiler failed for ${filePath} with exit code ${result.status}\n${result.stderr || ''}`
-        );
+        throw new Error(`Compiler failed for ${filePath} with exit code ${result.status}\n${result.stderr || ''}`);
     }
-
     if (result.stderr && result.stderr.trim().length > 0 && compilerRunOptions.suppressWarnings !== true) {
         const lines = String(result.stderr)
             .split('\n')
@@ -137,19 +141,19 @@ function runCompiler(filePath, stdinSource, compilerOpts = {}, compilerRunOption
         for (const line of lines) {
             if (typeof compilerRunOptions.onWarning === 'function') {
                 compilerRunOptions.onWarning(line);
-            } else {
+            }
+            else {
                 console.warn(line);
             }
         }
     }
-
     try {
         return JSON.parse(result.stdout);
-    } catch (err) {
+    }
+    catch (err) {
         throw new Error(`Compiler emitted invalid JSON: ${err.message}`);
     }
 }
-
 /**
  * Strip component <style> blocks before script-only component IR compilation.
  * Component style emission is handled by page compilation/bundler paths.
@@ -160,7 +164,6 @@ function runCompiler(filePath, stdinSource, compilerOpts = {}, compilerRunOption
 function stripStyleBlocks(source) {
     return String(source || '').replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, '');
 }
-
 /**
  * Build a deterministic raw->rewritten expression map for a component by
  * comparing template-only expressions with script-aware expressions.
@@ -169,7 +172,7 @@ function stripStyleBlocks(source) {
  * @param {string} componentSource
  * @param {object} compIr
  * @param {object} compilerOpts
- * @param {string} compilerBin
+ * @param {string|object} compilerBin
  * @returns {{
  *   map: Map<string, string>,
  *   bindings: Map<string, {
@@ -199,22 +202,20 @@ function buildComponentExpressionRewrite(compPath, componentSource, compIr, comp
     if (rewrittenExpressions.length === 0) {
         return out;
     }
-
     const templateOnly = extractTemplate(componentSource);
     if (!templateOnly.trim()) {
         return out;
     }
-
     let templateIr;
     try {
         templateIr = runCompiler(compPath, templateOnly, compilerOpts, {
             suppressWarnings: true,
-            compilerBin
+            compilerToolchain: compilerBin
         });
-    } catch {
+    }
+    catch {
         return out;
     }
-
     const rawExpressions = Array.isArray(templateIr?.expressions) ? templateIr.expressions : [];
     const count = Math.min(rawExpressions.length, rewrittenExpressions.length);
     for (let i = 0; i < count; i++) {
@@ -223,7 +224,6 @@ function buildComponentExpressionRewrite(compPath, componentSource, compIr, comp
         if (typeof raw !== 'string' || typeof rewritten !== 'string') {
             continue;
         }
-
         const binding = rewrittenBindings[i];
         const normalizedBinding = binding && typeof binding === 'object'
             ? {
@@ -237,13 +237,11 @@ function buildComponentExpressionRewrite(compPath, componentSource, compIr, comp
                 component_binding: typeof binding.component_binding === 'string' ? binding.component_binding : null
             }
             : null;
-
         out.sequence.push({
             raw,
             rewritten,
             binding: normalizedBinding
         });
-
         if (!out.ambiguous.has(raw) && normalizedBinding) {
             const existingBinding = out.bindings.get(raw);
             if (existingBinding) {
@@ -253,11 +251,11 @@ function buildComponentExpressionRewrite(compPath, componentSource, compIr, comp
                     out.ambiguous.add(raw);
                     continue;
                 }
-            } else {
+            }
+            else {
                 out.bindings.set(raw, normalizedBinding);
             }
         }
-
         if (raw !== rewritten) {
             const existing = out.map.get(raw);
             if (existing && existing !== rewritten) {
@@ -271,15 +269,12 @@ function buildComponentExpressionRewrite(compPath, componentSource, compIr, comp
             }
         }
     }
-
     return out;
 }
-
 function remapCompiledExpressionSignals(compiledExpr, componentSignals, componentStateBindings, pageSignalIndexByStateKey) {
     if (typeof compiledExpr !== 'string' || compiledExpr.length === 0) {
         return null;
     }
-
     return compiledExpr.replace(/signalMap\.get\((\d+)\)/g, (full, rawIndex) => {
         const localIndex = Number.parseInt(rawIndex, 10);
         if (!Number.isInteger(localIndex)) {
@@ -300,24 +295,20 @@ function remapCompiledExpressionSignals(compiledExpr, componentSignals, componen
         return `signalMap.get(${pageIndex})`;
     });
 }
-
 function resolveRewrittenBindingMetadata(pageIr, componentRewrite, binding) {
     if (!binding || typeof binding !== 'object') {
         return null;
     }
-
     const pageStateBindings = Array.isArray(pageIr?.hoisted?.state) ? pageIr.hoisted.state : [];
     const pageSignals = Array.isArray(pageIr?.signals) ? pageIr.signals : [];
     const pageStateIndexByKey = new Map();
     const pageSignalIndexByStateKey = new Map();
-
     for (let index = 0; index < pageStateBindings.length; index++) {
         const key = pageStateBindings[index]?.key;
         if (typeof key === 'string' && key.length > 0 && !pageStateIndexByKey.has(key)) {
             pageStateIndexByKey.set(key, index);
         }
     }
-
     for (let index = 0; index < pageSignals.length; index++) {
         const stateIndex = pageSignals[index]?.state_index;
         if (!Number.isInteger(stateIndex)) {
@@ -328,32 +319,27 @@ function resolveRewrittenBindingMetadata(pageIr, componentRewrite, binding) {
             pageSignalIndexByStateKey.set(stateKey, index);
         }
     }
-
     const componentSignals = Array.isArray(componentRewrite?.signals) ? componentRewrite.signals : [];
     const componentStateBindings = Array.isArray(componentRewrite?.stateBindings) ? componentRewrite.stateBindings : [];
-
     let signalIndices = Array.isArray(binding.signal_indices)
-        ? [...new Set(
-            binding.signal_indices
+        ? [...new Set(binding.signal_indices
                 .map((signalIndex) => {
-                    if (!Number.isInteger(signalIndex)) {
-                        return null;
-                    }
-                    const signal = componentSignals[signalIndex];
-                    if (!signal || !Number.isInteger(signal.state_index)) {
-                        return null;
-                    }
-                    const stateKey = componentStateBindings[signal.state_index]?.key;
-                    if (typeof stateKey !== 'string' || stateKey.length === 0) {
-                        return null;
-                    }
-                    const pageIndex = pageSignalIndexByStateKey.get(stateKey);
-                    return Number.isInteger(pageIndex) ? pageIndex : null;
-                })
-                .filter((value) => Number.isInteger(value))
-        )].sort((a, b) => a - b)
+                if (!Number.isInteger(signalIndex)) {
+                    return null;
+                }
+                const signal = componentSignals[signalIndex];
+                if (!signal || !Number.isInteger(signal.state_index)) {
+                    return null;
+                }
+                const stateKey = componentStateBindings[signal.state_index]?.key;
+                if (typeof stateKey !== 'string' || stateKey.length === 0) {
+                    return null;
+                }
+                const pageIndex = pageSignalIndexByStateKey.get(stateKey);
+                return Number.isInteger(pageIndex) ? pageIndex : null;
+            })
+                .filter((value) => Number.isInteger(value)))].sort((a, b) => a - b)
         : [];
-
     let signalIndex = null;
     if (Number.isInteger(binding.signal_index)) {
         const signal = componentSignals[binding.signal_index];
@@ -366,47 +352,32 @@ function resolveRewrittenBindingMetadata(pageIr, componentRewrite, binding) {
     if (signalIndex === null && signalIndices.length === 1) {
         signalIndex = signalIndices[0];
     }
-
     let stateIndex = null;
     if (Number.isInteger(binding.state_index)) {
         const stateKey = componentStateBindings[binding.state_index]?.key;
         const pageIndex = typeof stateKey === 'string' ? pageStateIndexByKey.get(stateKey) : null;
         stateIndex = Number.isInteger(pageIndex) ? pageIndex : null;
     }
-
     if (Number.isInteger(stateIndex)) {
         const fallbackSignalIndices = pageSignals
             .map((signal, index) => signal?.state_index === stateIndex ? index : null)
             .filter((value) => Number.isInteger(value));
-        const signalIndicesMatchState = signalIndices.every(
-            (index) => pageSignals[index]?.state_index === stateIndex
-        );
+        const signalIndicesMatchState = signalIndices.every((index) => pageSignals[index]?.state_index === stateIndex);
         if ((!signalIndicesMatchState || signalIndices.length === 0) && fallbackSignalIndices.length > 0) {
             signalIndices = fallbackSignalIndices;
         }
-        if (
-            (signalIndex === null || pageSignals[signalIndex]?.state_index !== stateIndex) &&
-            fallbackSignalIndices.length === 1
-        ) {
+        if ((signalIndex === null || pageSignals[signalIndex]?.state_index !== stateIndex) &&
+            fallbackSignalIndices.length === 1) {
             signalIndex = fallbackSignalIndices[0];
         }
     }
-
-    let compiledExpr = remapCompiledExpressionSignals(
-        binding.compiled_expr,
-        componentSignals,
-        componentStateBindings,
-        pageSignalIndexByStateKey
-    );
-    if (
-        typeof compiledExpr === 'string' &&
+    let compiledExpr = remapCompiledExpressionSignals(binding.compiled_expr, componentSignals, componentStateBindings, pageSignalIndexByStateKey);
+    if (typeof compiledExpr === 'string' &&
         signalIndices.length === 1 &&
         Array.isArray(binding.signal_indices) &&
-        binding.signal_indices.length <= 1
-    ) {
+        binding.signal_indices.length <= 1) {
         compiledExpr = compiledExpr.replace(/signalMap\.get\(\d+\)/g, `signalMap.get(${signalIndices[0]})`);
     }
-
     return {
         compiled_expr: compiledExpr,
         signal_index: signalIndex,
@@ -416,7 +387,6 @@ function resolveRewrittenBindingMetadata(pageIr, componentRewrite, binding) {
         component_binding: typeof binding.component_binding === 'string' ? binding.component_binding : null
     };
 }
-
 /**
  * Merge a per-component rewrite table into the page-level rewrite table.
  *
@@ -452,7 +422,6 @@ function mergeExpressionRewriteMaps(pageMap, pageBindingMap, pageAmbiguous, comp
         pageMap.delete(raw);
         pageBindingMap.delete(raw);
     }
-
     for (const [raw, binding] of componentRewrite.bindings.entries()) {
         if (pageAmbiguous.has(raw)) {
             continue;
@@ -467,7 +436,6 @@ function mergeExpressionRewriteMaps(pageMap, pageBindingMap, pageAmbiguous, comp
         }
         pageBindingMap.set(raw, resolved);
     }
-
     for (const [raw, rewritten] of componentRewrite.map.entries()) {
         if (pageAmbiguous.has(raw)) {
             continue;
@@ -482,47 +450,38 @@ function mergeExpressionRewriteMaps(pageMap, pageBindingMap, pageAmbiguous, comp
         pageMap.set(raw, rewritten);
     }
 }
-
 function resolveStateKeyFromBindings(identifier, stateBindings, preferredKeys = null) {
     const ident = String(identifier || '').trim();
     if (!ident) {
         return null;
     }
-
     const exact = stateBindings.find((entry) => String(entry?.key || '') === ident);
     if (exact && typeof exact.key === 'string') {
         return exact.key;
     }
-
     const suffix = `_${ident}`;
     const matches = stateBindings
         .map((entry) => String(entry?.key || ''))
         .filter((key) => key.endsWith(suffix));
-
     if (preferredKeys instanceof Set && preferredKeys.size > 0) {
         const preferredMatches = matches.filter((key) => preferredKeys.has(key));
         if (preferredMatches.length === 1) {
             return preferredMatches[0];
         }
     }
-
     if (matches.length === 1) {
         return matches[0];
     }
-
     return null;
 }
-
 function rewriteRefBindingIdentifiers(pageIr, preferredKeys = null) {
     if (!Array.isArray(pageIr?.ref_bindings) || pageIr.ref_bindings.length === 0) {
         return;
     }
-
     const stateBindings = Array.isArray(pageIr?.hoisted?.state) ? pageIr.hoisted.state : [];
     if (stateBindings.length === 0) {
         return;
     }
-
     for (const binding of pageIr.ref_bindings) {
         if (!binding || typeof binding !== 'object' || typeof binding.identifier !== 'string') {
             continue;
@@ -533,7 +492,6 @@ function rewriteRefBindingIdentifiers(pageIr, preferredKeys = null) {
         }
     }
 }
-
 /**
  * Rewrite unresolved page expressions using component script-aware mappings.
  *
@@ -554,7 +512,6 @@ function applyExpressionRewrites(pageIr, expressionMap, bindingMap, ambiguous) {
         return;
     }
     const bindings = Array.isArray(pageIr.expression_bindings) ? pageIr.expression_bindings : [];
-
     for (let index = 0; index < pageIr.expressions.length; index++) {
         const current = pageIr.expressions[index];
         if (typeof current !== 'string') {
@@ -563,21 +520,17 @@ function applyExpressionRewrites(pageIr, expressionMap, bindingMap, ambiguous) {
         if (ambiguous.has(current)) {
             continue;
         }
-
         const rewritten = expressionMap.get(current);
         const rewrittenBinding = bindingMap.get(current);
         if (rewritten && rewritten !== current) {
             pageIr.expressions[index] = rewritten;
         }
-
         if (!bindings[index] || typeof bindings[index] !== 'object') {
             continue;
         }
-
         if (rewritten && rewritten !== current && bindings[index].literal === current) {
             bindings[index].literal = rewritten;
         }
-
         if (rewrittenBinding) {
             bindings[index].compiled_expr = rewrittenBinding.compiled_expr;
             bindings[index].signal_index = rewrittenBinding.signal_index;
@@ -585,21 +538,18 @@ function applyExpressionRewrites(pageIr, expressionMap, bindingMap, ambiguous) {
             bindings[index].state_index = rewrittenBinding.state_index;
             bindings[index].component_instance = rewrittenBinding.component_instance;
             bindings[index].component_binding = rewrittenBinding.component_binding;
-        } else if (rewritten && rewritten !== current && bindings[index].compiled_expr === current) {
+        }
+        else if (rewritten && rewritten !== current && bindings[index].compiled_expr === current) {
             bindings[index].compiled_expr = rewritten;
         }
-
-        if (
-            !rewrittenBinding &&
+        if (!rewrittenBinding &&
             (!rewritten || rewritten === current) &&
             bindings[index].literal === current &&
-            bindings[index].compiled_expr === current
-        ) {
+            bindings[index].compiled_expr === current) {
             bindings[index].compiled_expr = current;
         }
     }
 }
-
 function applyScopedIdentifierRewrites(pageIr, scopeRewrite) {
     if (!Array.isArray(pageIr?.expressions) || pageIr.expressions.length === 0) {
         return;
@@ -608,17 +558,14 @@ function applyScopedIdentifierRewrites(pageIr, scopeRewrite) {
     const rewriteContext = {
         scopeRewrite
     };
-
     for (let index = 0; index < pageIr.expressions.length; index++) {
         const current = pageIr.expressions[index];
         if (typeof current === 'string') {
             pageIr.expressions[index] = rewritePropsExpression(current, rewriteContext);
         }
-
         if (!bindings[index] || typeof bindings[index] !== 'object') {
             continue;
         }
-
         if (typeof bindings[index].literal === 'string') {
             bindings[index].literal = rewritePropsExpression(bindings[index].literal, rewriteContext);
         }
@@ -627,18 +574,15 @@ function applyScopedIdentifierRewrites(pageIr, scopeRewrite) {
         }
     }
 }
-
 function synthesizeSignalBackedCompiledExpressions(pageIr) {
     if (!Array.isArray(pageIr?.expression_bindings) || pageIr.expression_bindings.length === 0) {
         return;
     }
-
     const stateBindings = Array.isArray(pageIr?.hoisted?.state) ? pageIr.hoisted.state : [];
     const signals = Array.isArray(pageIr?.signals) ? pageIr.signals : [];
     if (stateBindings.length === 0 || signals.length === 0) {
         return;
     }
-
     const signalIndexByStateKey = new Map();
     for (let index = 0; index < signals.length; index++) {
         const stateIndex = signals[index]?.state_index;
@@ -650,7 +594,6 @@ function synthesizeSignalBackedCompiledExpressions(pageIr) {
     if (signalIndexByStateKey.size === 0) {
         return;
     }
-
     for (let index = 0; index < pageIr.expression_bindings.length; index++) {
         const binding = pageIr.expression_bindings[index];
         if (!binding || typeof binding !== 'object') {
@@ -659,7 +602,6 @@ function synthesizeSignalBackedCompiledExpressions(pageIr) {
         if (typeof binding.compiled_expr === 'string' && binding.compiled_expr.includes('signalMap.get(')) {
             continue;
         }
-
         const candidate = typeof binding.literal === 'string' && binding.literal.trim().length > 0
             ? binding.literal
             : typeof pageIr.expressions?.[index] === 'string'
@@ -668,7 +610,6 @@ function synthesizeSignalBackedCompiledExpressions(pageIr) {
         if (typeof candidate !== 'string' || candidate.trim().length === 0) {
             continue;
         }
-
         let rewritten = candidate;
         const signalIndices = [];
         for (const [stateKey, signalIndex] of signalIndexByStateKey.entries()) {
@@ -683,11 +624,9 @@ function synthesizeSignalBackedCompiledExpressions(pageIr) {
             rewritten = rewritten.replace(pattern, `signalMap.get(${signalIndex}).get()`);
             signalIndices.push(signalIndex);
         }
-
         if (rewritten === candidate || signalIndices.length === 0) {
             continue;
         }
-
         const uniqueSignalIndices = [...new Set(signalIndices)].sort((a, b) => a - b);
         binding.compiled_expr = rewritten;
         binding.signal_indices = uniqueSignalIndices;
@@ -700,20 +639,16 @@ function synthesizeSignalBackedCompiledExpressions(pageIr) {
         }
     }
 }
-
 function normalizeExpressionBindingDependencies(pageIr) {
     if (!Array.isArray(pageIr?.expression_bindings) || pageIr.expression_bindings.length === 0) {
         return;
     }
-
     const signals = Array.isArray(pageIr.signals) ? pageIr.signals : [];
     const dependencyRe = /signalMap\.get\((\d+)\)/g;
-
     for (const binding of pageIr.expression_bindings) {
         if (!binding || typeof binding !== 'object' || typeof binding.compiled_expr !== 'string') {
             continue;
         }
-
         const indices = [];
         dependencyRe.lastIndex = 0;
         let match;
@@ -723,36 +658,28 @@ function normalizeExpressionBindingDependencies(pageIr) {
                 indices.push(index);
             }
         }
-
         if (indices.length === 0) {
             continue;
         }
-
         let signalIndices = [...new Set(indices)].sort((a, b) => a - b);
         if (Number.isInteger(binding.state_index)) {
             const owningSignalIndices = signals
                 .map((signal, index) => signal?.state_index === binding.state_index ? index : null)
                 .filter((value) => Number.isInteger(value));
-            const extractedMatchState =
-                signalIndices.length > 0 &&
+            const extractedMatchState = signalIndices.length > 0 &&
                 signalIndices.every((index) => signals[index]?.state_index === binding.state_index);
             if (owningSignalIndices.length > 0 && !extractedMatchState) {
                 signalIndices = owningSignalIndices;
             }
         }
-
-        if (
-            !Array.isArray(binding.signal_indices) ||
+        if (!Array.isArray(binding.signal_indices) ||
             binding.signal_indices.length === 0 ||
-            binding.signal_indices.some((index) => signals[index]?.state_index !== binding.state_index)
-        ) {
+            binding.signal_indices.some((index) => signals[index]?.state_index !== binding.state_index)) {
             binding.signal_indices = signalIndices;
         }
-        if (
-            (!Number.isInteger(binding.signal_index) ||
-                signals[binding.signal_index]?.state_index !== binding.state_index) &&
-            signalIndices.length === 1
-        ) {
+        if ((!Number.isInteger(binding.signal_index) ||
+            signals[binding.signal_index]?.state_index !== binding.state_index) &&
+            signalIndices.length === 1) {
             binding.signal_index = signalIndices[0];
         }
         if (!Number.isInteger(binding.state_index) && Number.isInteger(binding.signal_index)) {
@@ -762,14 +689,10 @@ function normalizeExpressionBindingDependencies(pageIr) {
             }
         }
         if (signalIndices.length === 1) {
-            binding.compiled_expr = binding.compiled_expr.replace(
-                /signalMap\.get\(\d+\)/g,
-                `signalMap.get(${signalIndices[0]})`
-            );
+            binding.compiled_expr = binding.compiled_expr.replace(/signalMap\.get\(\d+\)/g, `signalMap.get(${signalIndices[0]})`);
         }
     }
 }
-
 /**
  * Rewrite legacy markup-literal identifiers in expression literals to the
  * internal `__ZENITH_INTERNAL_ZENHTML` binding used by the runtime.
@@ -784,39 +707,32 @@ function normalizeExpressionBindingDependencies(pageIr) {
 // Stored as concatenation so the drift gate scanner does not flag build.js itself.
 const _LEGACY_MARKUP_IDENT = 'zen' + 'html';
 const _LEGACY_MARKUP_RE = new RegExp(`\\b${_LEGACY_MARKUP_IDENT}\\b`, 'g');
-
 function rewriteLegacyMarkupIdentifiers(pageIr) {
     if (!Array.isArray(pageIr?.expressions) || pageIr.expressions.length === 0) {
         return;
     }
     const bindings = Array.isArray(pageIr.expression_bindings) ? pageIr.expression_bindings : [];
-
     for (let i = 0; i < pageIr.expressions.length; i++) {
         if (typeof pageIr.expressions[i] === 'string' && pageIr.expressions[i].includes(_LEGACY_MARKUP_IDENT)) {
             _LEGACY_MARKUP_RE.lastIndex = 0;
             pageIr.expressions[i] = pageIr.expressions[i].replace(_LEGACY_MARKUP_RE, '__ZENITH_INTERNAL_ZENHTML');
         }
-        if (
-            bindings[i] &&
+        if (bindings[i] &&
             typeof bindings[i] === 'object' &&
             typeof bindings[i].literal === 'string' &&
-            bindings[i].literal.includes(_LEGACY_MARKUP_IDENT)
-        ) {
+            bindings[i].literal.includes(_LEGACY_MARKUP_IDENT)) {
             _LEGACY_MARKUP_RE.lastIndex = 0;
             bindings[i].literal = bindings[i].literal.replace(_LEGACY_MARKUP_RE, '__ZENITH_INTERNAL_ZENHTML');
         }
-        if (
-            bindings[i] &&
+        if (bindings[i] &&
             typeof bindings[i] === 'object' &&
             typeof bindings[i].compiled_expr === 'string' &&
-            bindings[i].compiled_expr.includes(_LEGACY_MARKUP_IDENT)
-        ) {
+            bindings[i].compiled_expr.includes(_LEGACY_MARKUP_IDENT)) {
             _LEGACY_MARKUP_RE.lastIndex = 0;
             bindings[i].compiled_expr = bindings[i].compiled_expr.replace(_LEGACY_MARKUP_RE, '__ZENITH_INTERNAL_ZENHTML');
         }
     }
 }
-
 /**
  * @param {string} targetPath
  * @param {string} next
@@ -828,7 +744,6 @@ function writeIfChanged(targetPath, next) {
     }
     writeFileSync(targetPath, next, 'utf8');
 }
-
 /**
  * @param {string} routePath
  * @returns {string}
@@ -852,7 +767,6 @@ function routeParamsType(routePath) {
     }
     return `{ ${fields.join(', ')} }`;
 }
-
 /**
  * @param {Array<{ path: string, file: string }>} manifest
  * @returns {string}
@@ -866,13 +780,10 @@ function renderZenithRouteDts(manifest) {
         '  namespace Zenith {',
         '    interface RouteParamsMap {'
     ];
-
     const sortedManifest = [...manifest].sort((a, b) => a.path.localeCompare(b.path));
-
     for (const entry of sortedManifest) {
         lines.push(`      ${JSON.stringify(entry.path)}: ${routeParamsType(entry.path)};`);
     }
-
     lines.push('    }');
     lines.push('');
     lines.push('    type ParamsFor<P extends keyof RouteParamsMap> = RouteParamsMap[P];');
@@ -881,7 +792,6 @@ function renderZenithRouteDts(manifest) {
     lines.push('');
     return `${lines.join('\n')}\n`;
 }
-
 /**
  * @returns {string}
  */
@@ -936,7 +846,6 @@ function renderZenithEnvDts() {
         ''
     ].join('\n');
 }
-
 /**
  * @param {string} pagesDir
  * @returns {string}
@@ -949,7 +858,6 @@ function deriveProjectRootFromPagesDir(pagesDir) {
     }
     return parent;
 }
-
 /**
  * @param {{ manifest: Array<{ path: string, file: string }>, pagesDir: string }} input
  * @returns {Promise<void>}
@@ -958,12 +866,10 @@ async function ensureZenithTypeDeclarations(input) {
     const projectRoot = deriveProjectRootFromPagesDir(input.pagesDir);
     const zenithDir = resolve(projectRoot, '.zenith');
     await mkdir(zenithDir, { recursive: true });
-
     const envPath = join(zenithDir, 'zenith-env.d.ts');
     const routesPath = join(zenithDir, 'zenith-routes.d.ts');
     writeIfChanged(envPath, renderZenithEnvDts());
     writeIfChanged(routesPath, renderZenithRouteDts(input.manifest));
-
     const tsconfigPath = resolve(projectRoot, 'tsconfig.json');
     if (!existsSync(tsconfigPath)) {
         return;
@@ -977,11 +883,11 @@ async function ensureZenithTypeDeclarations(input) {
             parsed.include = include;
             writeIfChanged(tsconfigPath, `${JSON.stringify(parsed, null, 2)}\n`);
         }
-    } catch {
+    }
+    catch {
         // Non-JSON tsconfig variants are left untouched.
     }
 }
-
 /**
  * Extract one optional `<script server>` block from a page source.
  * Returns source with the block removed plus normalized server metadata.
@@ -994,131 +900,94 @@ async function ensureZenithTypeDeclarations(input) {
 function extractServerScript(source, sourceFile, compilerOpts = {}) {
     const scriptRe = /<script\b([^>]*)>([\s\S]*?)<\/script>/gi;
     const serverMatches = [];
-    const reservedServerExportRe =
-        /\bexport\s+const\s+(?:data|prerender|guard|load)\b|\bexport\s+(?:async\s+)?function\s+(?:load|guard)\s*\(|\bexport\s+const\s+(?:load|guard)\s*=/;
-
+    const reservedServerExportRe = /\bexport\s+const\s+(?:data|prerender|guard|load)\b|\bexport\s+(?:async\s+)?function\s+(?:load|guard)\s*\(|\bexport\s+const\s+(?:load|guard)\s*=/;
     for (const match of source.matchAll(scriptRe)) {
         const attrs = String(match[1] || '');
         const body = String(match[2] || '');
         const isServer = /\bserver\b/i.test(attrs);
-
         if (!isServer && reservedServerExportRe.test(body)) {
-            throw new Error(
-                `Zenith server script contract violation:\n` +
+            throw new Error(`Zenith server script contract violation:\n` +
                 `  File: ${sourceFile}\n` +
                 `  Reason: guard/load/data exports are only allowed in <script server lang="ts"> or adjacent .guard.ts / .load.ts files\n` +
-                `  Example: move the export into <script server lang="ts">`
-            );
+                `  Example: move the export into <script server lang="ts">`);
         }
-
         if (isServer) {
             serverMatches.push(match);
         }
     }
-
     if (serverMatches.length === 0) {
         return { source, serverScript: null };
     }
-
     if (serverMatches.length > 1) {
-        throw new Error(
-            `Zenith server script contract violation:\n` +
+        throw new Error(`Zenith server script contract violation:\n` +
             `  File: ${sourceFile}\n` +
             `  Reason: multiple <script server> blocks are not supported\n` +
-            `  Example: keep exactly one <script server>...</script> block`
-        );
+            `  Example: keep exactly one <script server>...</script> block`);
     }
-
     const match = serverMatches[0];
     const full = match[0] || '';
     const attrs = String(match[1] || '');
-
     const hasLangTs = /\blang\s*=\s*["']ts["']/i.test(attrs);
     const hasLangJs = /\blang\s*=\s*["'](?:js|javascript)["']/i.test(attrs);
     const hasAnyLang = /\blang\s*=/i.test(attrs);
     const isTypescriptDefault = compilerOpts && compilerOpts.typescriptDefault === true;
-
     if (!hasLangTs) {
         if (!isTypescriptDefault || hasLangJs || hasAnyLang) {
-            throw new Error(
-                `Zenith server script contract violation:\n` +
+            throw new Error(`Zenith server script contract violation:\n` +
                 `  File: ${sourceFile}\n` +
                 `  Reason: Zenith requires TypeScript server scripts. Add lang="ts" (or enable typescriptDefault).\n` +
-                `  Example: <script server lang="ts">`
-            );
+                `  Example: <script server lang="ts">`);
         }
     }
-
     const serverSource = String(match[2] || '').trim();
     if (!serverSource) {
-        throw new Error(
-            `Zenith server script contract violation:\n` +
+        throw new Error(`Zenith server script contract violation:\n` +
             `  File: ${sourceFile}\n` +
             `  Reason: <script server> block is empty\n` +
-            `  Example: export const data = { ... }`
-        );
+            `  Example: export const data = { ... }`);
     }
-
     const loadFnMatch = serverSource.match(/\bexport\s+(?:async\s+)?function\s+load\s*\(([^)]*)\)/);
     const loadConstParenMatch = serverSource.match(/\bexport\s+const\s+load\s*=\s*(?:async\s*)?\(([^)]*)\)\s*=>/);
-    const loadConstSingleArgMatch = serverSource.match(
-        /\bexport\s+const\s+load\s*=\s*(?:async\s*)?([a-zA-Z_$][a-zA-Z0-9_$]*)\s*=>/
-    );
+    const loadConstSingleArgMatch = serverSource.match(/\bexport\s+const\s+load\s*=\s*(?:async\s*)?([a-zA-Z_$][a-zA-Z0-9_$]*)\s*=>/);
     const hasLoad = Boolean(loadFnMatch || loadConstParenMatch || loadConstSingleArgMatch);
-    const loadMatchCount =
-        Number(Boolean(loadFnMatch)) +
+    const loadMatchCount = Number(Boolean(loadFnMatch)) +
         Number(Boolean(loadConstParenMatch)) +
         Number(Boolean(loadConstSingleArgMatch));
     if (loadMatchCount > 1) {
-        throw new Error(
-            `Zenith server script contract violation:\n` +
+        throw new Error(`Zenith server script contract violation:\n` +
             `  File: ${sourceFile}\n` +
             `  Reason: multiple load exports detected\n` +
-            `  Example: keep exactly one export const load = async (ctx) => ({ ... })`
-        );
+            `  Example: keep exactly one export const load = async (ctx) => ({ ... })`);
     }
-
     const guardFnMatch = serverSource.match(/\bexport\s+(?:async\s+)?function\s+guard\s*\(([^)]*)\)/);
     const guardConstParenMatch = serverSource.match(/\bexport\s+const\s+guard\s*=\s*(?:async\s*)?\(([^)]*)\)\s*=>/);
-    const guardConstSingleArgMatch = serverSource.match(
-        /\bexport\s+const\s+guard\s*=\s*(?:async\s*)?([a-zA-Z_$][a-zA-Z0-9_$]*)\s*=>/
-    );
+    const guardConstSingleArgMatch = serverSource.match(/\bexport\s+const\s+guard\s*=\s*(?:async\s*)?([a-zA-Z_$][a-zA-Z0-9_$]*)\s*=>/);
     const hasGuard = Boolean(guardFnMatch || guardConstParenMatch || guardConstSingleArgMatch);
-    const guardMatchCount =
-        Number(Boolean(guardFnMatch)) +
+    const guardMatchCount = Number(Boolean(guardFnMatch)) +
         Number(Boolean(guardConstParenMatch)) +
         Number(Boolean(guardConstSingleArgMatch));
     if (guardMatchCount > 1) {
-        throw new Error(
-            `Zenith server script contract violation:\n` +
+        throw new Error(`Zenith server script contract violation:\n` +
             `  File: ${sourceFile}\n` +
             `  Reason: multiple guard exports detected\n` +
-            `  Example: keep exactly one export const guard = async (ctx) => ({ ... })`
-        );
+            `  Example: keep exactly one export const guard = async (ctx) => ({ ... })`);
     }
-
     const hasData = /\bexport\s+const\s+data\b/.test(serverSource);
     const hasSsrData = /\bexport\s+const\s+ssr_data\b/.test(serverSource);
     const hasSsr = /\bexport\s+const\s+ssr\b/.test(serverSource);
     const hasProps = /\bexport\s+const\s+props\b/.test(serverSource);
-
     if (hasData && hasLoad) {
-        throw new Error(
-            `Zenith server script contract violation:\n` +
+        throw new Error(`Zenith server script contract violation:\n` +
             `  File: ${sourceFile}\n` +
             `  Reason: export either data or load(ctx), not both\n` +
-            `  Example: remove data and return payload from load(ctx)`
-        );
+            `  Example: remove data and return payload from load(ctx)`);
     }
     if ((hasData || hasLoad) && (hasSsrData || hasSsr || hasProps)) {
-        throw new Error(
-            `Zenith server script contract violation:\n` +
+        throw new Error(`Zenith server script contract violation:\n` +
             `  File: ${sourceFile}\n` +
             `  Reason: data/load cannot be combined with legacy ssr_data/ssr/props exports\n` +
-            `  Example: use only export const data or export const load`
-        );
+            `  Example: use only export const data or export const load`);
     }
-
     if (hasLoad) {
         const singleArg = String(loadConstSingleArgMatch?.[1] || '').trim();
         const paramsText = String((loadFnMatch || loadConstParenMatch)?.[1] || '').trim();
@@ -1128,15 +997,12 @@ function extractServerScript(source, sourceFile, compilerOpts = {}) {
                 ? 0
                 : paramsText.split(',').length;
         if (arity !== 1) {
-            throw new Error(
-                `Zenith server script contract violation:\n` +
+            throw new Error(`Zenith server script contract violation:\n` +
                 `  File: ${sourceFile}\n` +
                 `  Reason: load(ctx) must accept exactly one argument\n` +
-                `  Example: export const load = async (ctx) => ({ ... })`
-            );
+                `  Example: export const load = async (ctx) => ({ ... })`);
         }
     }
-
     if (hasGuard) {
         const singleArg = String(guardConstSingleArgMatch?.[1] || '').trim();
         const paramsText = String((guardFnMatch || guardConstParenMatch)?.[1] || '').trim();
@@ -1146,26 +1012,21 @@ function extractServerScript(source, sourceFile, compilerOpts = {}) {
                 ? 0
                 : paramsText.split(',').length;
         if (arity !== 1) {
-            throw new Error(
-                `Zenith server script contract violation:\n` +
+            throw new Error(`Zenith server script contract violation:\n` +
                 `  File: ${sourceFile}\n` +
                 `  Reason: guard(ctx) must accept exactly one argument\n` +
-                `  Example: export const guard = async (ctx) => ({ ... })`
-            );
+                `  Example: export const guard = async (ctx) => ({ ... })`);
         }
     }
-
     const prerenderMatch = serverSource.match(/\bexport\s+const\s+prerender\s*=\s*([^\n;]+)/);
     let prerender = false;
     if (prerenderMatch) {
         const rawValue = String(prerenderMatch[1] || '').trim();
         if (!/^(true|false)\b/.test(rawValue)) {
-            throw new Error(
-                `Zenith server script contract violation:\n` +
+            throw new Error(`Zenith server script contract violation:\n` +
                 `  File: ${sourceFile}\n` +
                 `  Reason: prerender must be a boolean literal\n` +
-                `  Example: export const prerender = true`
-            );
+                `  Example: export const prerender = true`);
         }
         prerender = rawValue.startsWith('true');
     }
@@ -1182,10 +1043,8 @@ function extractServerScript(source, sourceFile, compilerOpts = {}) {
             }
         };
     }
-
     const end = start + full.length;
     const stripped = `${source.slice(0, start)}${source.slice(end)}`;
-
     return {
         source: stripped,
         serverScript: {
@@ -1197,9 +1056,7 @@ function extractServerScript(source, sourceFile, compilerOpts = {}) {
         }
     };
 }
-
 const OPEN_COMPONENT_TAG_RE = /<([A-Z][a-zA-Z0-9]*)(\s[^<>]*?)?\s*(\/?)>/g;
-
 /**
  * Collect original attribute strings for component usages in a page source.
  *
@@ -1225,7 +1082,6 @@ function collectComponentUsageAttrs(source, registry, ownerPath = null) {
     }
     return out;
 }
-
 /**
  * Collect component usage attrs recursively so nested component callsites
  * receive deterministic props preludes during page-hoist merging.
@@ -1248,7 +1104,6 @@ function collectRecursiveComponentUsageAttrs(source, registry, ownerPath = null,
         }
         out.get(name).push(...attrsList);
     }
-
     for (const name of local.keys()) {
         const compPath = registry.get(name);
         if (!compPath || visitedFiles.has(compPath)) {
@@ -1258,10 +1113,8 @@ function collectRecursiveComponentUsageAttrs(source, registry, ownerPath = null,
         const componentSource = readFileSync(compPath, 'utf8');
         collectRecursiveComponentUsageAttrs(componentSource, registry, compPath, visitedFiles, out);
     }
-
     return out;
 }
-
 /**
  * Merge a component's IR into the page IR.
  *
@@ -1293,12 +1146,10 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             }
         }
     }
-
     // Merge component_instances
     if (compIr.component_instances?.length) {
         pageIr.component_instances.push(...compIr.component_instances);
     }
-
     if (knownRefKeys instanceof Set && Array.isArray(compIr.ref_bindings)) {
         const componentStateBindings = Array.isArray(compIr?.hoisted?.state) ? compIr.hoisted.state : [];
         for (const binding of compIr.ref_bindings) {
@@ -1309,7 +1160,6 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             knownRefKeys.add(resolved || binding.identifier);
         }
     }
-
     // Merge hoisted imports (deduplicated, rebased to the page file path)
     if (compIr.hoisted?.imports?.length) {
         for (const imp of compIr.hoisted.imports) {
@@ -1325,7 +1175,6 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             }
         }
     }
-
     // Merge hoisted symbol/state tables for runtime literal evaluation.
     // Component-expanded expressions can reference rewritten component symbols,
     // so state keys/values must be present in the page envelope.
@@ -1352,11 +1201,9 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             }
         }
         if (Array.isArray(compIr.hoisted.state)) {
-            const existingKeys = new Set(
-                (pageIr.hoisted.state || [])
-                    .map((entry) => entry && typeof entry === 'object' ? entry.key : null)
-                    .filter(Boolean)
-            );
+            const existingKeys = new Set((pageIr.hoisted.state || [])
+                .map((entry) => entry && typeof entry === 'object' ? entry.key : null)
+                .filter(Boolean));
             for (const stateEntry of compIr.hoisted.state) {
                 if (!stateEntry || typeof stateEntry !== 'object') {
                     continue;
@@ -1372,18 +1219,14 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             }
         }
     }
-
     if (options.includeCode && Array.isArray(compIr.signals)) {
         pageIr.signals = Array.isArray(pageIr.signals) ? pageIr.signals : [];
-        const existingSignalStateKeys = new Set(
-            pageIr.signals
-                .map((signal) => {
-                    const stateIndex = signal?.state_index;
-                    return Number.isInteger(stateIndex) ? pageIr.hoisted.state?.[stateIndex]?.key : null;
-                })
-                .filter(Boolean)
-        );
-
+        const existingSignalStateKeys = new Set(pageIr.signals
+            .map((signal) => {
+            const stateIndex = signal?.state_index;
+            return Number.isInteger(stateIndex) ? pageIr.hoisted.state?.[stateIndex]?.key : null;
+        })
+            .filter(Boolean));
         for (const signal of compIr.signals) {
             if (!signal || !Number.isInteger(signal.state_index)) {
                 continue;
@@ -1407,7 +1250,6 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             });
         }
     }
-
     // Merge hoisted code blocks (rebased to the page file path)
     if (options.includeCode && compIr.hoisted?.code?.length) {
         for (const block of compIr.hoisted.code) {
@@ -1415,11 +1257,7 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
             const filteredImports = options.cssImportsOnly
                 ? stripNonCssStaticImportsInSource(rebased)
                 : rebased;
-            const withPropsPrelude = injectPropsPrelude(
-                filteredImports,
-                options.componentAttrs || '',
-                options.componentAttrsRewrite || null
-            );
+            const withPropsPrelude = injectPropsPrelude(filteredImports, options.componentAttrs || '', options.componentAttrsRewrite || null);
             const transpiled = transpileTypeScriptToJs(withPropsPrelude, compPath);
             const deduped = dedupeStaticImportsInSource(transpiled, seenStaticImports);
             const deferred = deferComponentRuntimeBlock(deduped);
@@ -1429,7 +1267,6 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
         }
     }
 }
-
 /**
  * @param {string} spec
  * @returns {boolean}
@@ -1437,7 +1274,6 @@ function mergeComponentIr(pageIr, compIr, compPath, pageFile, options, seenStati
 function isRelativeSpecifier(spec) {
     return spec.startsWith('./') || spec.startsWith('../');
 }
-
 /**
  * @param {string} spec
  * @param {string} fromFile
@@ -1448,7 +1284,6 @@ function rebaseRelativeSpecifier(spec, fromFile, toFile) {
     if (!isRelativeSpecifier(spec)) {
         return spec;
     }
-
     const absoluteTarget = resolve(dirname(fromFile), spec);
     let rebased = relative(dirname(toFile), absoluteTarget).replaceAll('\\', '/');
     if (!rebased.startsWith('.')) {
@@ -1456,7 +1291,6 @@ function rebaseRelativeSpecifier(spec, fromFile, toFile) {
     }
     return rebased;
 }
-
 /**
  * @param {string} line
  * @param {string} fromFile
@@ -1468,16 +1302,13 @@ function rewriteStaticImportLine(line, fromFile, toFile) {
     if (!match) {
         return line;
     }
-
     const spec = match[1];
     if (!isRelativeSpecifier(spec)) {
         return line;
     }
-
     const rebased = rebaseRelativeSpecifier(spec, fromFile, toFile);
     return replaceImportSpecifierLiteral(line, spec, rebased);
 }
-
 /**
  * @param {string} line
  * @returns {string | null}
@@ -1486,7 +1317,6 @@ function extractStaticImportSpecifier(line) {
     const match = line.match(/^\s*import(?:\s+[^'"]+?\s+from)?\s*['"]([^'"]+)['"]\s*;?\s*$/);
     return match ? match[1] : null;
 }
-
 /**
  * @param {string} spec
  * @returns {boolean}
@@ -1494,7 +1324,6 @@ function extractStaticImportSpecifier(line) {
 function isCssSpecifier(spec) {
     return /\.css(?:[?#].*)?$/i.test(spec);
 }
-
 /**
  * @param {string} source
  * @param {string} fromFile
@@ -1502,12 +1331,8 @@ function isCssSpecifier(spec) {
  * @returns {string}
  */
 function rewriteStaticImportsInSource(source, fromFile, toFile) {
-    return source.replace(
-        /(^\s*import(?:\s+[^'"]+?\s+from)?\s*['"])([^'"]+)(['"]\s*;?\s*$)/gm,
-        (_full, prefix, spec, suffix) => `${prefix}${rebaseRelativeSpecifier(spec, fromFile, toFile)}${suffix}`
-    );
+    return source.replace(/(^\s*import(?:\s+[^'"]+?\s+from)?\s*['"])([^'"]+)(['"]\s*;?\s*$)/gm, (_full, prefix, spec, suffix) => `${prefix}${rebaseRelativeSpecifier(spec, fromFile, toFile)}${suffix}`);
 }
-
 /**
  * @param {string} line
  * @param {string} oldSpec
@@ -1519,15 +1344,12 @@ function replaceImportSpecifierLiteral(line, oldSpec, newSpec) {
     if (line.includes(single)) {
         return line.replace(single, `'${newSpec}'`);
     }
-
     const dbl = `"${oldSpec}"`;
     if (line.includes(dbl)) {
         return line.replace(dbl, `"${newSpec}"`);
     }
-
     return line;
 }
-
 /**
  * @param {string} source
  * @param {string} sourceFile
@@ -1538,7 +1360,6 @@ function transpileTypeScriptToJs(source, sourceFile) {
     if (!ts) {
         return source;
     }
-
     try {
         const output = ts.transpileModule(source, {
             fileName: sourceFile,
@@ -1552,13 +1373,12 @@ function transpileTypeScriptToJs(source, sourceFile) {
             reportDiagnostics: false,
         });
         return output.outputText;
-    } catch {
+    }
+    catch {
         return source;
     }
 }
-
 const DEFERRED_RUNTIME_CALLS = new Set(['zenMount', 'zenEffect', 'zeneffect']);
-
 /**
  * Split top-level runtime side-effect calls from hoistable declarations.
  *
@@ -1574,27 +1394,18 @@ function splitDeferredRuntimeCalls(body) {
     if (!ts || typeof body !== 'string' || body.trim().length === 0) {
         return { hoisted: body, deferred: '' };
     }
-
     let sourceFile;
     try {
-        sourceFile = ts.createSourceFile(
-            'zenith-component-runtime.ts',
-            body,
-            ts.ScriptTarget.Latest,
-            true,
-            ts.ScriptKind.TS
-        );
-    } catch {
+        sourceFile = ts.createSourceFile('zenith-component-runtime.ts', body, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    }
+    catch {
         return { hoisted: body, deferred: '' };
     }
-
     if (!sourceFile || !Array.isArray(sourceFile.statements) || sourceFile.statements.length === 0) {
         return { hoisted: body, deferred: '' };
     }
-
     /** @type {Array<{ start: number, end: number }>} */
     const ranges = [];
-
     for (const statement of sourceFile.statements) {
         if (!ts.isExpressionStatement(statement)) {
             continue;
@@ -1602,16 +1413,13 @@ function splitDeferredRuntimeCalls(body) {
         if (!ts.isCallExpression(statement.expression)) {
             continue;
         }
-
         let callee = statement.expression.expression;
         while (ts.isParenthesizedExpression(callee)) {
             callee = callee.expression;
         }
-
         if (!ts.isIdentifier(callee) || !DEFERRED_RUNTIME_CALLS.has(callee.text)) {
             continue;
         }
-
         const start = typeof statement.getFullStart === 'function'
             ? statement.getFullStart()
             : statement.pos;
@@ -1621,11 +1429,9 @@ function splitDeferredRuntimeCalls(body) {
         }
         ranges.push({ start, end });
     }
-
     if (ranges.length === 0) {
         return { hoisted: body, deferred: '' };
     }
-
     ranges.sort((a, b) => a.start - b.start);
     /** @type {Array<{ start: number, end: number }>} */
     const merged = [];
@@ -1639,11 +1445,9 @@ function splitDeferredRuntimeCalls(body) {
             last.end = range.end;
         }
     }
-
     let cursor = 0;
     let hoisted = '';
     let deferred = '';
-
     for (const range of merged) {
         if (range.start > cursor) {
             hoisted += body.slice(cursor, range.start);
@@ -1654,14 +1458,11 @@ function splitDeferredRuntimeCalls(body) {
         }
         cursor = range.end;
     }
-
     if (cursor < body.length) {
         hoisted += body.slice(cursor);
     }
-
     return { hoisted, deferred };
 }
-
 /**
  * @param {string} source
  * @param {Set<string>} seenStaticImports
@@ -1670,14 +1471,12 @@ function splitDeferredRuntimeCalls(body) {
 function dedupeStaticImportsInSource(source, seenStaticImports) {
     const lines = source.split('\n');
     const kept = [];
-
     for (const line of lines) {
         const spec = extractStaticImportSpecifier(line);
         if (!spec) {
             kept.push(line);
             continue;
         }
-
         const key = line.trim();
         if (seenStaticImports.has(key)) {
             continue;
@@ -1685,10 +1484,8 @@ function dedupeStaticImportsInSource(source, seenStaticImports) {
         seenStaticImports.add(key);
         kept.push(line);
     }
-
     return kept.join('\n');
 }
-
 /**
  * @param {string} source
  * @returns {string}
@@ -1708,7 +1505,6 @@ function stripNonCssStaticImportsInSource(source) {
     }
     return kept.join('\n');
 }
-
 /**
  * @param {string} key
  * @returns {string}
@@ -1719,7 +1515,6 @@ function renderObjectKey(key) {
     }
     return JSON.stringify(key);
 }
-
 /**
  * @param {string} value
  * @returns {string | null}
@@ -1733,7 +1528,6 @@ function deriveScopedIdentifierAlias(value) {
     const candidate = parts.length > 1 ? parts[parts.length - 1] : ident;
     return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(candidate) ? candidate : ident;
 }
-
 /**
  * @param {string} source
  * @returns {string[]}
@@ -1743,7 +1537,6 @@ function extractDeclaredIdentifiers(source) {
     if (!text) {
         return [];
     }
-
     const ts = loadTypeScriptApi();
     if (ts) {
         const sourceFile = ts.createSourceFile('zenith-hoisted-declaration.ts', text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
@@ -1761,7 +1554,6 @@ function extractDeclaredIdentifiers(source) {
                 }
             }
         };
-
         for (const statement of sourceFile.statements) {
             if (!ts.isVariableStatement(statement)) {
                 continue;
@@ -1770,12 +1562,10 @@ function extractDeclaredIdentifiers(source) {
                 collectBindingNames(declaration.name);
             }
         }
-
         if (identifiers.length > 0) {
             return identifiers;
         }
     }
-
     const fallback = [];
     const match = text.match(/^\s*(?:const|let|var)\s+([\s\S]+?);?\s*$/);
     if (!match) {
@@ -1789,7 +1579,6 @@ function extractDeclaredIdentifiers(source) {
     }
     return fallback;
 }
-
 /**
  * @param {Map<string, string>} map
  * @param {Set<string>} ambiguous
@@ -1810,7 +1599,6 @@ function recordScopedIdentifierRewrite(map, ambiguous, raw, rewritten) {
         map.set(raw, rewritten);
     }
 }
-
 /**
  * @param {object | null | undefined} ir
  * @returns {{ map: Map<string, string>, ambiguous: Set<string> }}
@@ -1820,13 +1608,11 @@ function buildScopedIdentifierRewrite(ir) {
     if (!ir || typeof ir !== 'object') {
         return out;
     }
-
     const stateBindings = Array.isArray(ir?.hoisted?.state) ? ir.hoisted.state : [];
     for (const stateEntry of stateBindings) {
         const key = typeof stateEntry?.key === 'string' ? stateEntry.key : null;
         recordScopedIdentifierRewrite(out.map, out.ambiguous, deriveScopedIdentifierAlias(key), key);
     }
-
     const functionBindings = Array.isArray(ir?.hoisted?.functions) ? ir.hoisted.functions : [];
     for (const fnName of functionBindings) {
         if (typeof fnName !== 'string') {
@@ -1834,7 +1620,6 @@ function buildScopedIdentifierRewrite(ir) {
         }
         recordScopedIdentifierRewrite(out.map, out.ambiguous, deriveScopedIdentifierAlias(fnName), fnName);
     }
-
     const declarations = Array.isArray(ir?.hoisted?.declarations) ? ir.hoisted.declarations : [];
     for (const declaration of declarations) {
         if (typeof declaration !== 'string') {
@@ -1844,24 +1629,21 @@ function buildScopedIdentifierRewrite(ir) {
             recordScopedIdentifierRewrite(out.map, out.ambiguous, deriveScopedIdentifierAlias(identifier), identifier);
         }
     }
-
     return out;
 }
-
 function rewriteIdentifiersWithinExpression(expr, scopeMap, scopeAmbiguous) {
     const ts = loadTypeScriptApi();
     if (!(scopeMap instanceof Map) || !ts) {
         return expr;
     }
-
     const wrapped = `const __zenith_expr__ = (${expr});`;
     let sourceFile;
     try {
         sourceFile = ts.createSourceFile('zenith-expression.ts', wrapped, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-    } catch {
+    }
+    catch {
         return expr;
     }
-
     const statement = sourceFile.statements[0];
     if (!statement || !ts.isVariableStatement(statement)) {
         return expr;
@@ -1871,7 +1653,6 @@ function rewriteIdentifiersWithinExpression(expr, scopeMap, scopeAmbiguous) {
     if (!root) {
         return expr;
     }
-
     const replacements = [];
     const collectBoundNames = (name, target) => {
         if (ts.isIdentifier(name)) {
@@ -1922,15 +1703,12 @@ function rewriteIdentifiersWithinExpression(expr, scopeMap, scopeAmbiguous) {
                 collectBoundNames(param.name, nextBindings);
             }
         }
-
         if (ts.isIdentifier(node) && !shouldSkipIdentifier(node, nextBindings)) {
             const rewritten = scopeMap.get(node.text);
-            if (
-                typeof rewritten === 'string' &&
+            if (typeof rewritten === 'string' &&
                 rewritten.length > 0 &&
                 rewritten !== node.text &&
-                !(scopeAmbiguous instanceof Set && scopeAmbiguous.has(node.text))
-            ) {
+                !(scopeAmbiguous instanceof Set && scopeAmbiguous.has(node.text))) {
                 replacements.push({
                     start: node.getStart(sourceFile),
                     end: node.getEnd(),
@@ -1938,20 +1716,16 @@ function rewriteIdentifiersWithinExpression(expr, scopeMap, scopeAmbiguous) {
                 });
             }
         }
-
         ts.forEachChild(node, (child) => visit(child, nextBindings));
     };
-
     visit(root, new Set());
     if (replacements.length === 0) {
         return expr;
     }
-
     let rewritten = wrapped;
     for (const replacement of replacements.sort((a, b) => b.start - a.start)) {
         rewritten = `${rewritten.slice(0, replacement.start)}${replacement.text}${rewritten.slice(replacement.end)}`;
     }
-
     const prefix = 'const __zenith_expr__ = (';
     const suffix = ');';
     if (!rewritten.startsWith(prefix) || !rewritten.endsWith(suffix)) {
@@ -1959,7 +1733,6 @@ function rewriteIdentifiersWithinExpression(expr, scopeMap, scopeAmbiguous) {
     }
     return rewritten.slice(prefix.length, rewritten.length - suffix.length);
 }
-
 /**
  * @param {string} expr
  * @param {{
@@ -1973,19 +1746,15 @@ function rewritePropsExpression(expr, rewriteContext = null) {
     if (!trimmed) {
         return trimmed;
     }
-
     const expressionMap = rewriteContext?.expressionRewrite?.map;
     const expressionAmbiguous = rewriteContext?.expressionRewrite?.ambiguous;
-    if (
-        expressionMap instanceof Map &&
-        !(expressionAmbiguous instanceof Set && expressionAmbiguous.has(trimmed))
-    ) {
+    if (expressionMap instanceof Map &&
+        !(expressionAmbiguous instanceof Set && expressionAmbiguous.has(trimmed))) {
         const exact = expressionMap.get(trimmed);
         if (typeof exact === 'string' && exact.length > 0) {
             return exact;
         }
     }
-
     const scopeMap = rewriteContext?.scopeRewrite?.map;
     const scopeAmbiguous = rewriteContext?.scopeRewrite?.ambiguous;
     const rootMatch = trimmed.match(/^([A-Za-z_$][A-Za-z0-9_$]*)([\s\S]*)$/);
@@ -1995,20 +1764,16 @@ function rewritePropsExpression(expr, rewriteContext = null) {
     if (!rootMatch) {
         return rewriteIdentifiersWithinExpression(trimmed, scopeMap, scopeAmbiguous);
     }
-
     const root = rootMatch[1];
     if (scopeAmbiguous instanceof Set && scopeAmbiguous.has(root)) {
         return rewriteIdentifiersWithinExpression(trimmed, scopeMap, scopeAmbiguous);
     }
-
     const rewrittenRoot = scopeMap.get(root);
     if (typeof rewrittenRoot !== 'string' || rewrittenRoot.length === 0 || rewrittenRoot === root) {
         return rewriteIdentifiersWithinExpression(trimmed, scopeMap, scopeAmbiguous);
     }
-
     return `${rewrittenRoot}${rootMatch[2]}`;
 }
-
 /**
  * @param {string} attrs
  * @param {{
@@ -2022,7 +1787,6 @@ function renderPropsLiteralFromAttrs(attrs, rewriteContext = null) {
     if (!src) {
         return '{}';
     }
-
     const entries = [];
     const attrRe = /([A-Za-z_$][A-Za-z0-9_$-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|\{([\s\S]*?)\}))?/g;
     let match;
@@ -2031,30 +1795,27 @@ function renderPropsLiteralFromAttrs(attrs, rewriteContext = null) {
         if (!rawName || rawName.startsWith('on:')) {
             continue;
         }
-
         const doubleQuoted = match[2];
         const singleQuoted = match[3];
         const expressionValue = match[4];
         let valueCode = 'true';
         if (doubleQuoted !== undefined) {
             valueCode = JSON.stringify(doubleQuoted);
-        } else if (singleQuoted !== undefined) {
+        }
+        else if (singleQuoted !== undefined) {
             valueCode = JSON.stringify(singleQuoted);
-        } else if (expressionValue !== undefined) {
+        }
+        else if (expressionValue !== undefined) {
             const trimmed = String(expressionValue).trim();
             valueCode = trimmed.length > 0 ? rewritePropsExpression(trimmed, rewriteContext) : 'undefined';
         }
-
         entries.push(`${renderObjectKey(rawName)}: ${valueCode}`);
     }
-
     if (entries.length === 0) {
         return '{}';
     }
-
     return `{ ${entries.join(', ')} }`;
 }
-
 /**
  * @param {string} source
  * @param {string} attrs
@@ -2074,11 +1835,9 @@ function injectPropsPrelude(source, attrs, rewriteContext = null) {
     if (/\b(?:const|let|var)\s+props\b/.test(source)) {
         return source;
     }
-
     const propsLiteral = renderPropsLiteralFromAttrs(attrs, rewriteContext);
     return `var props = ${propsLiteral};\n${source}`;
 }
-
 /**
  * @param {string} source
  * @returns {string}
@@ -2088,7 +1847,6 @@ function deferComponentRuntimeBlock(source) {
     const importLines = [];
     const bodyLines = [];
     let inImportPrefix = true;
-
     for (const line of lines) {
         if (inImportPrefix && extractStaticImportSpecifier(line)) {
             importLines.push(line);
@@ -2097,19 +1855,16 @@ function deferComponentRuntimeBlock(source) {
         inImportPrefix = false;
         bodyLines.push(line);
     }
-
     const body = bodyLines.join('\n');
     if (body.trim().length === 0) {
         return importLines.join('\n');
     }
-
     const { hoisted, deferred } = splitDeferredRuntimeCalls(body);
     if (deferred.trim().length === 0) {
         return [importLines.join('\n').trim(), hoisted.trim()]
             .filter((segment) => segment.length > 0)
             .join('\n');
     }
-
     const indentedBody = deferred
         .trim()
         .split('\n')
@@ -2124,10 +1879,8 @@ function deferComponentRuntimeBlock(source) {
     ]
         .filter((segment) => segment.length > 0)
         .join('\n');
-
     return wrapped;
 }
-
 /**
  * Run bundler process for one page envelope.
  *
@@ -2136,28 +1889,28 @@ function deferComponentRuntimeBlock(source) {
  * @param {string} projectRoot
  * @param {object | null} [logger]
  * @param {boolean} [showInfo]
- * @param {string} [bundlerBin]
+ * @param {string|object} [bundlerBin]
  * @returns {Promise<void>}
  */
-function runBundler(
-    envelope,
-    outDir,
-    projectRoot,
-    logger = null,
-    showInfo = true,
-    bundlerBin = resolveBundlerBin(projectRoot)
-) {
+function runBundler(envelope, outDir, projectRoot, logger = null, showInfo = true, bundlerBin = resolveBundlerBin(projectRoot)) {
     return new Promise((resolvePromise, rejectPromise) => {
         const useStructuredLogger = Boolean(logger && typeof logger.childLine === 'function');
-        const child = spawn(
-            bundlerBin,
-            ['--out-dir', outDir],
-            {
-                cwd: projectRoot,
-                stdio: useStructuredLogger ? ['pipe', 'pipe', 'pipe'] : ['pipe', 'inherit', 'inherit']
-            }
-        );
-
+        const bundlerToolchain = bundlerBin && typeof bundlerBin === 'object'
+            ? bundlerBin
+            : null;
+        const bundlerCandidate = bundlerToolchain
+            ? getActiveToolchainCandidate(bundlerToolchain)
+            : null;
+        const bundlerPath = bundlerCandidate?.command || bundlerBin;
+        const bundlerArgs = [
+            ...(Array.isArray(bundlerCandidate?.argsPrefix) ? bundlerCandidate.argsPrefix : []),
+            '--out-dir',
+            outDir
+        ];
+        const child = spawn(bundlerPath, bundlerArgs, {
+            cwd: projectRoot,
+            stdio: useStructuredLogger ? ['pipe', 'pipe', 'pipe'] : ['pipe', 'inherit', 'inherit']
+        });
         if (useStructuredLogger) {
             forwardStreamLines(child.stdout, (line) => {
                 logger.childLine('bundler', line, { stream: 'stdout', showInfo });
@@ -2166,11 +1919,9 @@ function runBundler(
                 logger.childLine('bundler', line, { stream: 'stderr', showInfo: true });
             });
         }
-
         child.on('error', (err) => {
             rejectPromise(new Error(`Bundler spawn failed: ${err.message}`));
         });
-
         child.on('close', (code) => {
             if (code === 0) {
                 resolvePromise();
@@ -2178,12 +1929,10 @@ function runBundler(
             }
             rejectPromise(new Error(`Bundler failed with exit code ${code}`));
         });
-
         child.stdin.write(JSON.stringify(envelope));
         child.stdin.end();
     });
 }
-
 /**
  * Collect generated assets for reporting.
  *
@@ -2192,15 +1941,14 @@ function runBundler(
  */
 async function collectAssets(rootDir) {
     const files = [];
-
     async function walk(dir) {
         let entries = [];
         try {
             entries = await readdir(dir);
-        } catch {
+        }
+        catch {
             return;
         }
-
         entries.sort((a, b) => a.localeCompare(b));
         for (const name of entries) {
             const fullPath = join(dir, name);
@@ -2214,12 +1962,10 @@ async function collectAssets(rootDir) {
             }
         }
     }
-
     await walk(rootDir);
     files.sort((a, b) => a.localeCompare(b));
     return files;
 }
-
 /**
  * Build all pages by orchestrating compiler and bundler binaries.
  *
@@ -2238,30 +1984,28 @@ async function collectAssets(rootDir) {
 export async function build(options) {
     const { pagesDir, outDir, config = {}, logger = null, showBundlerInfo = true } = options;
     const projectRoot = deriveProjectRootFromPagesDir(pagesDir);
-    const compilerBin = resolveCompilerBin(projectRoot);
-    const bundlerBin = resolveBundlerBin(projectRoot);
+    const compilerBin = createCompilerToolchain({ projectRoot, logger });
+    const bundlerBin = createBundlerToolchain({ projectRoot, logger });
     const softNavigationEnabled = config.softNavigation === true || config.router === true;
     const compilerOpts = {
         typescriptDefault: config.typescriptDefault === true,
         experimentalEmbeddedMarkup: config.embeddedMarkupExpressions === true || config.experimental?.embeddedMarkupExpressions === true,
         strictDomLints: config.strictDomLints === true
     };
-
     await rm(outDir, { recursive: true, force: true });
     await mkdir(outDir, { recursive: true });
-
+    ensureToolchainCompatibility(bundlerBin);
+    const resolvedBundlerCandidate = getActiveToolchainCandidate(bundlerBin);
     if (logger) {
         await maybeWarnAboutZenithVersionMismatch({
             projectRoot,
             logger,
             command: 'build',
-            bundlerBinPath: bundlerBin
+            bundlerBinPath: resolvedBundlerCandidate?.path || resolveBundlerBin(projectRoot)
         });
     }
-
     // Derive src/ directory from pages/ directory
     const srcDir = resolve(pagesDir, '..');
-
     // 1. Build component registry
     const registry = buildComponentRegistry(srcDir);
     if (registry.size > 0) {
@@ -2269,14 +2013,13 @@ export async function build(options) {
             logger.build(`registry=${registry.size} components`, {
                 onceKey: `component-registry:${registry.size}`
             });
-        } else {
+        }
+        else {
             console.log(`[zenith] Component registry: ${registry.size} components`);
         }
     }
-
     const manifest = await generateManifest(pagesDir);
     await ensureZenithTypeDeclarations({ manifest, pagesDir });
-
     // Cache: avoid re-compiling the same component for multiple pages
     /** @type {Map<string, object>} */
     const componentIrCache = new Map();
@@ -2291,42 +2034,31 @@ export async function build(options) {
         }
         console.warn(line);
     });
-
     const envelopes = [];
     for (const entry of manifest) {
         const sourceFile = join(pagesDir, entry.file);
         const rawSource = readFileSync(sourceFile, 'utf8');
         const componentOccurrences = collectExpandedComponentOccurrences(rawSource, registry, sourceFile);
-
         const baseName = sourceFile.slice(0, -extname(sourceFile).length);
         let adjacentGuard = null;
         let adjacentLoad = null;
         for (const ext of ['.ts', '.js']) {
-            if (!adjacentGuard && existsSync(`${baseName}.guard${ext}`)) adjacentGuard = `${baseName}.guard${ext}`;
-            if (!adjacentLoad && existsSync(`${baseName}.load${ext}`)) adjacentLoad = `${baseName}.load${ext}`;
+            if (!adjacentGuard && existsSync(`${baseName}.guard${ext}`))
+                adjacentGuard = `${baseName}.guard${ext}`;
+            if (!adjacentLoad && existsSync(`${baseName}.load${ext}`))
+                adjacentLoad = `${baseName}.load${ext}`;
         }
-
         // 2a. Expand PascalCase component tags
-        const { expandedSource } = expandComponents(
-            rawSource, registry, sourceFile
-        );
+        const { expandedSource } = expandComponents(rawSource, registry, sourceFile);
         const extractedServer = extractServerScript(expandedSource, sourceFile, compilerOpts);
         const compileSource = extractedServer.source;
-
         // 2b. Compile expanded page source via --stdin
-        const pageIr = runCompiler(
-            sourceFile,
-            compileSource,
-            compilerOpts,
-            {
-                compilerBin,
-                onWarning: emitCompilerWarning
-            }
-        );
-
+        const pageIr = runCompiler(sourceFile, compileSource, compilerOpts, {
+            compilerToolchain: compilerBin,
+            onWarning: emitCompilerWarning
+        });
         const hasGuard = (extractedServer.serverScript && extractedServer.serverScript.has_guard) || adjacentGuard !== null;
         const hasLoad = (extractedServer.serverScript && extractedServer.serverScript.has_load) || adjacentLoad !== null;
-
         if (extractedServer.serverScript) {
             pageIr.server_script = extractedServer.serverScript;
             pageIr.prerender = extractedServer.serverScript.prerender === true;
@@ -2334,21 +2066,16 @@ export async function build(options) {
                 pageIr.ssr_data = null;
             }
         }
-
         // Static Build Route Protection Policy
         if (pageIr.prerender === true && (hasGuard || hasLoad)) {
-            throw new Error(
-                `[zenith] Build failed for ${entry.file}: protected routes require SSR/runtime. ` +
-                `Cannot prerender a static route with a \`guard\` or \`load\` function.`
-            );
+            throw new Error(`[zenith] Build failed for ${entry.file}: protected routes require SSR/runtime. ` +
+                `Cannot prerender a static route with a \`guard\` or \`load\` function.`);
         }
-
         // Apply metadata to IR
         pageIr.has_guard = hasGuard;
         pageIr.has_load = hasLoad;
         pageIr.guard_module_ref = adjacentGuard ? relative(srcDir, adjacentGuard).replaceAll('\\', '/') : null;
         pageIr.load_module_ref = adjacentLoad ? relative(srcDir, adjacentLoad).replaceAll('\\', '/') : null;
-
         // Ensure IR has required array fields for merging
         pageIr.components_scripts = pageIr.components_scripts || {};
         pageIr.component_instances = pageIr.component_instances || [];
@@ -2366,189 +2093,109 @@ export async function build(options) {
             const key = occurrence.componentPath || occurrence.name;
             occurrenceCountByPath.set(key, (occurrenceCountByPath.get(key) || 0) + 1);
         }
-
         const pageExpressionRewriteMap = new Map();
         const pageExpressionBindingMap = new Map();
         const pageAmbiguousExpressionMap = new Set();
         const knownRefKeys = new Set();
         const componentOccurrencePlans = [];
         const pageScopeRewrite = buildScopedIdentifierRewrite(pageIr);
-        const pageSelfExpressionRewrite = buildComponentExpressionRewrite(
-            sourceFile,
-            compileSource,
-            pageIr,
-            compilerOpts,
-            compilerBin
-        );
-        mergeExpressionRewriteMaps(
-            pageExpressionRewriteMap,
-            pageExpressionBindingMap,
-            pageAmbiguousExpressionMap,
-            pageSelfExpressionRewrite,
-            pageIr
-        );
+        const pageSelfExpressionRewrite = buildComponentExpressionRewrite(sourceFile, compileSource, pageIr, compilerOpts, compilerBin);
+        mergeExpressionRewriteMaps(pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, pageSelfExpressionRewrite, pageIr);
         const componentScopeRewriteCache = new Map();
         let componentInstanceCounter = 0;
-
         // 2c. Compile each used component separately for its script IR
         for (const occurrence of componentOccurrences) {
             const compName = occurrence.name;
             const compPath = occurrence.componentPath || registry.get(compName);
-            if (!compPath) continue;
+            if (!compPath)
+                continue;
             const componentSource = readFileSync(compPath, 'utf8');
             const occurrenceCount = occurrenceCountByPath.get(compPath) || 0;
-
             let compIr;
             if (componentIrCache.has(compPath)) {
                 compIr = componentIrCache.get(compPath);
-            } else {
+            }
+            else {
                 const componentCompileSource = stripStyleBlocks(componentSource);
-                compIr = runCompiler(
-                    compPath,
-                    componentCompileSource,
-                    compilerOpts,
-                    {
-                        compilerBin,
-                        onWarning: emitCompilerWarning
-                    }
-                );
+                compIr = runCompiler(compPath, componentCompileSource, compilerOpts, {
+                    compilerToolchain: compilerBin,
+                    onWarning: emitCompilerWarning
+                });
                 componentIrCache.set(compPath, compIr);
             }
-
             let isDocMode = componentDocumentModeCache.get(compPath);
             if (isDocMode === undefined) {
                 isDocMode = isDocumentMode(extractTemplate(componentSource));
                 componentDocumentModeCache.set(compPath, isDocMode);
             }
-
             let expressionRewrite = componentExpressionRewriteCache.get(compPath);
             if (!expressionRewrite) {
-                expressionRewrite = buildComponentExpressionRewrite(
-                    compPath,
-                    componentSource,
-                    compIr,
-                    compilerOpts,
-                    compilerBin
-                );
+                expressionRewrite = buildComponentExpressionRewrite(compPath, componentSource, compIr, compilerOpts, compilerBin);
                 componentExpressionRewriteCache.set(compPath, expressionRewrite);
             }
-
             let attrExpressionRewrite = pageSelfExpressionRewrite;
             let attrScopeRewrite = pageScopeRewrite;
             const ownerPath = typeof occurrence.ownerPath === 'string' && occurrence.ownerPath.length > 0
                 ? occurrence.ownerPath
                 : sourceFile;
-
             if (ownerPath !== sourceFile) {
                 let ownerIr = componentIrCache.get(ownerPath);
                 if (!ownerIr) {
                     const ownerSource = readFileSync(ownerPath, 'utf8');
-                    ownerIr = runCompiler(
-                        ownerPath,
-                        stripStyleBlocks(ownerSource),
-                        compilerOpts,
-                        {
-                            compilerBin,
-                            onWarning: emitCompilerWarning
-                        }
-                    );
+                    ownerIr = runCompiler(ownerPath, stripStyleBlocks(ownerSource), compilerOpts, {
+                        compilerToolchain: compilerBin,
+                        onWarning: emitCompilerWarning
+                    });
                     componentIrCache.set(ownerPath, ownerIr);
                 }
-
                 attrExpressionRewrite = componentExpressionRewriteCache.get(ownerPath);
                 if (!attrExpressionRewrite) {
                     const ownerSource = readFileSync(ownerPath, 'utf8');
-                    attrExpressionRewrite = buildComponentExpressionRewrite(
-                        ownerPath,
-                        ownerSource,
-                        ownerIr,
-                        compilerOpts,
-                        compilerBin
-                    );
+                    attrExpressionRewrite = buildComponentExpressionRewrite(ownerPath, ownerSource, ownerIr, compilerOpts, compilerBin);
                     componentExpressionRewriteCache.set(ownerPath, attrExpressionRewrite);
                 }
-
                 attrScopeRewrite = componentScopeRewriteCache.get(ownerPath);
                 if (!attrScopeRewrite) {
                     attrScopeRewrite = buildScopedIdentifierRewrite(ownerIr);
                     componentScopeRewriteCache.set(ownerPath, attrScopeRewrite);
                 }
             }
-
             const useIsolatedInstance = occurrenceCount > 1;
             const { ir: instanceIr, refIdentifierPairs } = useIsolatedInstance
-                ? cloneComponentIrForInstance(
-                    compIr,
-                    componentInstanceCounter++,
-                    extractDeclaredIdentifiers,
-                    resolveStateKeyFromBindings
-                )
+                ? cloneComponentIrForInstance(compIr, componentInstanceCounter++, extractDeclaredIdentifiers, resolveStateKeyFromBindings)
                 : { ir: compIr, refIdentifierPairs: [] };
             const instanceRewrite = useIsolatedInstance
-                ? buildComponentExpressionRewrite(
-                    compPath,
-                    componentSource,
-                    instanceIr,
-                    compilerOpts,
-                    compilerBin
-                )
+                ? buildComponentExpressionRewrite(compPath, componentSource, instanceIr, compilerOpts, compilerBin)
                 : expressionRewrite;
-
             // 2d. Merge component IR into page IR
-            mergeComponentIr(
-                pageIr,
-                instanceIr,
-                compPath,
-                sourceFile,
-                {
-                    includeCode: true,
-                    cssImportsOnly: isDocMode,
-                    documentMode: isDocMode,
-                    componentAttrs: typeof occurrence.attrs === 'string' ? occurrence.attrs : '',
-                    componentAttrsRewrite: {
-                        expressionRewrite: attrExpressionRewrite,
-                        scopeRewrite: attrScopeRewrite
-                    }
-                },
-                seenStaticImports,
-                knownRefKeys
-            );
-
+            mergeComponentIr(pageIr, instanceIr, compPath, sourceFile, {
+                includeCode: true,
+                cssImportsOnly: isDocMode,
+                documentMode: isDocMode,
+                componentAttrs: typeof occurrence.attrs === 'string' ? occurrence.attrs : '',
+                componentAttrsRewrite: {
+                    expressionRewrite: attrExpressionRewrite,
+                    scopeRewrite: attrScopeRewrite
+                }
+            }, seenStaticImports, knownRefKeys);
             if (useIsolatedInstance) {
                 componentOccurrencePlans.push({
                     rewrite: instanceRewrite,
                     expressionSequence: instanceRewrite.sequence,
                     refSequence: refIdentifierPairs
                 });
-            } else {
-                mergeExpressionRewriteMaps(
-                    pageExpressionRewriteMap,
-                    pageExpressionBindingMap,
-                    pageAmbiguousExpressionMap,
-                    expressionRewrite,
-                    pageIr
-                );
+            }
+            else {
+                mergeExpressionRewriteMaps(pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, expressionRewrite, pageIr);
             }
         }
-
-        applyOccurrenceRewritePlans(
-            pageIr,
-            componentOccurrencePlans,
-            (rewrite, binding) => resolveRewrittenBindingMetadata(pageIr, rewrite, binding)
-        );
-        applyExpressionRewrites(
-            pageIr,
-            pageExpressionRewriteMap,
-            pageExpressionBindingMap,
-            pageAmbiguousExpressionMap
-        );
+        applyOccurrenceRewritePlans(pageIr, componentOccurrencePlans, (rewrite, binding) => resolveRewrittenBindingMetadata(pageIr, rewrite, binding));
+        applyExpressionRewrites(pageIr, pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap);
         applyScopedIdentifierRewrites(pageIr, buildScopedIdentifierRewrite(pageIr));
         synthesizeSignalBackedCompiledExpressions(pageIr);
         normalizeExpressionBindingDependencies(pageIr);
-
         rewriteLegacyMarkupIdentifiers(pageIr);
         rewriteRefBindingIdentifiers(pageIr, knownRefKeys);
-
         envelopes.push({
             route: entry.path,
             file: sourceFile,
@@ -2556,11 +2203,9 @@ export async function build(options) {
             router: softNavigationEnabled
         });
     }
-
     if (envelopes.length > 0) {
         await runBundler(envelopes, outDir, projectRoot, logger, showBundlerInfo, bundlerBin);
     }
-
     const assets = await collectAssets(outDir);
     return { pages: manifest.length, assets };
 }