@zenithbuild/cli 0.7.3 → 0.7.5

package/dist/build/expression-rewrites.js

@@ -1,13 +1,7 @@
 import { performance } from 'node:perf_hooks';
-import { extractTemplate } from '../resolve-components.js';
-import { runCompiler } from './compiler-runtime.js';
+import { rewriteCompilerSignalMapReferences } from './compiler-signal-expression.js';
 /**
- * @param {string} compPath
- * @param {string} componentSource
  * @param {object} compIr
- * @param {object} compilerOpts
- * @param {string|object} compilerBin
- * @param {Map<string, string[]> | null} [templateExpressionCache]
  * @param {Record<string, number> | null} [rewriteMetrics]
  * @returns {{
  *   map: Map<string, string>,
@@ -25,7 +19,9 @@ import { runCompiler } from './compiler-runtime.js';
  *   sequence: Array<{ raw: string, rewritten: string, binding: object | null }>
  * }}
  */
-export function buildComponentExpressionRewrite(compPath, componentSource, compIr, compilerOpts, compilerBin, templateExpressionCache = null, rewriteMetrics = null) {
+export function buildComponentExpressionRewrite(compIr, rewriteMetrics = null) {
+    // Downstream is only allowed to read compiler-owned raw->rewritten pairs here.
+    // It must not synthesize new identifier meaning beyond this mapping.
     const out = {
         map: new Map(),
         bindings: new Map(),
@@ -39,60 +35,19 @@ export function buildComponentExpressionRewrite(compPath, componentSource, compI
     if (rewrittenExpressions.length === 0) {
         return out;
     }
-    const hoistedState = Array.isArray(compIr?.hoisted?.state) ? compIr.hoisted.state : [];
-    const hoistedFunctions = Array.isArray(compIr?.hoisted?.functions) ? compIr.hoisted.functions : [];
-    const hoistedDeclarations = Array.isArray(compIr?.hoisted?.declarations) ? compIr.hoisted.declarations : [];
-    const signals = Array.isArray(compIr?.signals) ? compIr.signals : [];
-    if (hoistedState.length === 0 &&
-        hoistedFunctions.length === 0 &&
-        hoistedDeclarations.length === 0 &&
-        signals.length === 0) {
-        return out;
-    }
     if (rewriteMetrics && typeof rewriteMetrics === 'object') {
         rewriteMetrics.calls += 1;
     }
-    const templateOnly = extractTemplate(componentSource);
-    if (!templateOnly.trim()) {
-        return out;
-    }
-    const cacheKey = `${compPath}\u0000${templateOnly}`;
-    let rawExpressions = null;
-    if (templateExpressionCache instanceof Map && templateExpressionCache.has(cacheKey)) {
-        rawExpressions = templateExpressionCache.get(cacheKey);
-        if (rewriteMetrics && typeof rewriteMetrics === 'object') {
-            rewriteMetrics.cacheHits += 1;
-        }
-    }
-    else {
-        let templateIr;
-        const templateCompileStartedAt = performance.now();
-        try {
-            templateIr = runCompiler(compPath, templateOnly, compilerOpts, {
-                suppressWarnings: true,
-                compilerToolchain: compilerBin
-            });
-        }
-        catch {
-            return out;
-        }
-        rawExpressions = Array.isArray(templateIr?.expressions) ? templateIr.expressions : [];
-        if (templateExpressionCache instanceof Map) {
-            templateExpressionCache.set(cacheKey, rawExpressions);
-        }
-        if (rewriteMetrics && typeof rewriteMetrics === 'object') {
-            rewriteMetrics.cacheMisses += 1;
-            rewriteMetrics.templateCompileMs += Math.round((performance.now() - templateCompileStartedAt) * 100) / 100;
-        }
-    }
-    const count = Math.min(rawExpressions.length, rewrittenExpressions.length);
-    for (let i = 0; i < count; i++) {
-        const raw = rawExpressions[i];
+    for (let i = 0; i < rewrittenExpressions.length; i++) {
         const rewritten = rewrittenExpressions[i];
-        if (typeof raw !== 'string' || typeof rewritten !== 'string') {
+        if (typeof rewritten !== 'string') {
             continue;
         }
         const binding = rewrittenBindings[i];
+        // Compiler emits the raw source literal for exact lookup; CLI only transports it.
+        const raw = typeof binding?.literal === 'string' && binding.literal.length > 0
+            ? binding.literal
+            : rewritten;
         const normalizedBinding = binding && typeof binding === 'object'
             ? {
                 compiled_expr: typeof binding.compiled_expr === 'string' ? binding.compiled_expr : null,
@@ -133,6 +88,10 @@ export function buildComponentExpressionRewrite(compPath, componentSource, compI
             }
         }
     }
+    if (rewriteMetrics && typeof rewriteMetrics === 'object') {
+        rewriteMetrics.compilerOwnedBindings += out.sequence.length;
+        rewriteMetrics.ambiguousBindings += out.ambiguous.size;
+    }
     return out;
 }
 /**
@@ -143,27 +102,28 @@ export function buildComponentExpressionRewrite(compPath, componentSource, compI
  * @returns {string | null}
  */
 export function remapCompiledExpressionSignals(compiledExpr, componentSignals, componentStateBindings, pageSignalIndexByStateKey) {
+    // This is a mechanical index remap across page merge boundaries, not a second compiler pass.
     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)) {
-            return full;
-        }
-        const signal = componentSignals[localIndex];
+    return rewriteCompilerSignalMapReferences(compiledExpr, ({ ts, signalIndex, valueRead }) => {
+        const signal = componentSignals[signalIndex];
         if (!signal || !Number.isInteger(signal.state_index)) {
-            return full;
+            return null;
         }
         const stateKey = componentStateBindings[signal.state_index]?.key;
         if (typeof stateKey !== 'string' || stateKey.length === 0) {
-            return full;
+            return null;
         }
         const pageIndex = pageSignalIndexByStateKey.get(stateKey);
         if (!Number.isInteger(pageIndex)) {
-            return full;
+            return null;
         }
-        return `signalMap.get(${pageIndex})`;
+        const signalMapRead = ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('signalMap'), 'get'), undefined, [ts.factory.createNumericLiteral(String(pageIndex))]);
+        if (valueRead) {
+            return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(signalMapRead, 'get'), undefined, []);
+        }
+        return signalMapRead;
     });
 }
 /**
@@ -319,6 +279,15 @@ export function mergeExpressionRewriteMaps(pageMap, pageBindingMap, pageAmbiguou
         const resolved = resolveRewrittenBindingMetadata(pageBindingContext, componentRewrite, binding, bindingResolutionMetrics);
         const existing = pageBindingMap.get(raw);
         if (existing && JSON.stringify(existing) !== JSON.stringify(resolved)) {
+            const existingWeight = measureBindingSpecificity(existing, raw);
+            const resolvedWeight = measureBindingSpecificity(resolved, raw);
+            if (resolvedWeight > existingWeight && existingWeight === 0) {
+                pageBindingMap.set(raw, resolved);
+                continue;
+            }
+            if (existingWeight > resolvedWeight && resolvedWeight === 0) {
+                continue;
+            }
             pageAmbiguous.add(raw);
             pageMap.delete(raw);
             pageBindingMap.delete(raw);
@@ -340,6 +309,33 @@ export function mergeExpressionRewriteMaps(pageMap, pageBindingMap, pageAmbiguou
         pageMap.set(raw, rewritten);
     }
 }
+function measureBindingSpecificity(binding, raw) {
+    if (!binding || typeof binding !== 'object') {
+        return 0;
+    }
+    let score = 0;
+    if (typeof binding.compiled_expr === 'string' &&
+        binding.compiled_expr.length > 0 &&
+        binding.compiled_expr !== raw) {
+        score += 4;
+    }
+    if (Number.isInteger(binding.signal_index)) {
+        score += 2;
+    }
+    if (Array.isArray(binding.signal_indices) && binding.signal_indices.length > 0) {
+        score += 2;
+    }
+    if (Number.isInteger(binding.state_index)) {
+        score += 1;
+    }
+    if (typeof binding.component_instance === 'string' && binding.component_instance.length > 0) {
+        score += 1;
+    }
+    if (typeof binding.component_binding === 'string' && binding.component_binding.length > 0) {
+        score += 1;
+    }
+    return score;
+}
 /**
  * @param {string} identifier
  * @param {Array<{ key?: string }>} stateBindings

package/dist/build/page-component-loop.d.ts

@@ -1,4 +1,4 @@
-export function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOwnerSource, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, templateExpressionCache, expressionRewriteMetrics, startupProfile }: {
+export function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOwnerSource, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, expressionRewriteMetrics, startupProfile }: {
     componentOccurrences: any;
     sourceFile: any;
     pageOwnerSource: any;
@@ -6,7 +6,6 @@ export function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOw
     compilerBin: any;
     timedRunCompiler: any;
     cooperativeYield: any;
-    templateExpressionCache: any;
     expressionRewriteMetrics: any;
     startupProfile: any;
 }): Promise<{
@@ -19,10 +18,6 @@ export function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOw
         ambiguous: Set<any>;
         sequence: never[];
     };
-    pageOwnerScopeRewrite: {
-        map: Map<any, any>;
-        ambiguous: Set<any>;
-    };
 } | {
     pageOwnerCompileMs: any;
     pageOwnerExpressionRewrite: {
@@ -51,12 +46,8 @@ export function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOw
             binding: object | null;
         }>;
     };
-    pageOwnerScopeRewrite: {
-        map: Map<string, string>;
-        ambiguous: Set<string>;
-    };
 }>;
-export function runPageComponentLoop({ componentOccurrences, occurrenceCountByPath, sourceFile, registry, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, startupProfile, compilerTotals, emitCompilerWarning, componentIrCache, componentDocumentModeCache, componentExpressionRewriteCache, templateExpressionCache, expressionRewriteMetrics, pageOwnerExpressionRewrite, pageOwnerScopeRewrite, pageIr, pageIrMergeCache, seenStaticImports, pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, knownRefKeys, componentOccurrencePlans, pagePhase, pageBindingResolutionBreakdown, pageMergeBreakdown, pageComponentLoopBreakdown, hoistedCodeTransformCache, pageStats }: {
+export function runPageComponentLoop({ componentOccurrences, occurrenceCountByPath, sourceFile, registry, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, startupProfile, compilerTotals, emitCompilerWarning, componentIrCache, componentDocumentModeCache, componentExpressionRewriteCache, expressionRewriteMetrics, pageOwnerExpressionRewrite, pageIr, pageIrMergeCache, seenStaticImports, pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, knownRefKeys, componentOccurrencePlans, imagePropsLiterals, pagePhase, pageBindingResolutionBreakdown, pageMergeBreakdown, pageComponentLoopBreakdown, hoistedCodeTransformCache, pageStats }: {
     componentOccurrences: any;
     occurrenceCountByPath: any;
     sourceFile: any;
@@ -71,10 +62,8 @@ export function runPageComponentLoop({ componentOccurrences, occurrenceCountByPa
     componentIrCache: any;
     componentDocumentModeCache: any;
     componentExpressionRewriteCache: any;
-    templateExpressionCache: any;
     expressionRewriteMetrics: any;
     pageOwnerExpressionRewrite: any;
-    pageOwnerScopeRewrite: any;
     pageIr: any;
     pageIrMergeCache: any;
     seenStaticImports: any;
@@ -83,6 +72,7 @@ export function runPageComponentLoop({ componentOccurrences, occurrenceCountByPa
     pageAmbiguousExpressionMap: any;
     knownRefKeys: any;
     componentOccurrencePlans: any;
+    imagePropsLiterals: any;
     pagePhase: any;
     pageBindingResolutionBreakdown: any;
     pageMergeBreakdown: any;

package/dist/build/page-component-loop.js

@@ -1,10 +1,10 @@
 import { readFileSync } from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { cloneComponentIrForInstance } from '../component-instance-ir.js';
+import { renderPropsLiteralFromAttrs } from './scoped-identifier-rewrite.js';
 import { extractTemplate, isDocumentMode } from '../resolve-components.js';
 import { buildComponentExpressionRewrite, mergeExpressionRewriteMaps, resolveStateKeyFromBindings } from './expression-rewrites.js';
 import { mergeComponentIr } from './merge-component-ir.js';
-import { buildScopedIdentifierRewrite } from './scoped-identifier-rewrite.js';
 import { stripStyleBlocks } from './compiler-runtime.js';
 import { extractDeclaredIdentifiers } from './typescript-expression-utils.js';
 function createEmptyExpressionRewrite() {
@@ -17,12 +17,6 @@ function createEmptyExpressionRewrite() {
         sequence: []
     };
 }
-function createEmptyScopeRewrite() {
-    return {
-        map: new Map(),
-        ambiguous: new Set()
-    };
-}
 async function resolveComponentIr({ compPath, componentSource, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, componentIrCache, compilerTotals, pageStats, startupProfile, emitCompilerWarning }) {
     let compIr;
     if (componentIrCache.has(compPath)) {
@@ -51,24 +45,23 @@ function resolveDocumentMode({ compPath, componentSource, componentDocumentModeC
     }
     return docMode;
 }
-function resolveComponentExpressionRewrite({ compPath, componentSource, compIr, compilerOpts, compilerBin, templateExpressionCache, expressionRewriteMetrics, componentExpressionRewriteCache, pageComponentLoopBreakdown, startupProfile }) {
+function resolveComponentExpressionRewrite({ compPath, compIr, expressionRewriteMetrics, componentExpressionRewriteCache, pageComponentLoopBreakdown, startupProfile }) {
     let expressionRewrite = componentExpressionRewriteCache.get(compPath);
     if (!expressionRewrite) {
         const startedAt = performance.now();
-        expressionRewrite = buildComponentExpressionRewrite(compPath, componentSource, compIr, compilerOpts, compilerBin, templateExpressionCache, expressionRewriteMetrics);
+        expressionRewrite = buildComponentExpressionRewrite(compIr, expressionRewriteMetrics);
         pageComponentLoopBreakdown.componentExpressionRewriteBuildMs += startupProfile.roundMs(performance.now() - startedAt);
         componentExpressionRewriteCache.set(compPath, expressionRewrite);
     }
     return expressionRewrite;
 }
-async function resolveOwnerRewriteContext({ occurrence, sourceFile, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, componentIrCache, componentExpressionRewriteCache, componentScopeRewriteCache, templateExpressionCache, expressionRewriteMetrics, startupProfile, compilerTotals, emitCompilerWarning, pageComponentLoopBreakdown, pageStats, pageOwnerExpressionRewrite, pageOwnerScopeRewrite }) {
+async function resolveOwnerRewriteContext({ occurrence, sourceFile, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, componentIrCache, componentExpressionRewriteCache, expressionRewriteMetrics, startupProfile, compilerTotals, emitCompilerWarning, pageComponentLoopBreakdown, pageStats, pageOwnerExpressionRewrite }) {
     const ownerPath = typeof occurrence.ownerPath === 'string' && occurrence.ownerPath.length > 0
         ? occurrence.ownerPath
         : sourceFile;
     if (ownerPath === sourceFile) {
         return {
-            attrExpressionRewrite: pageOwnerExpressionRewrite,
-            attrScopeRewrite: pageOwnerScopeRewrite
+            attrExpressionRewrite: pageOwnerExpressionRewrite
         };
     }
     let ownerIr = componentIrCache.get(ownerPath);
@@ -97,20 +90,13 @@ async function resolveOwnerRewriteContext({ occurrence, sourceFile, compilerOpts
             pageComponentLoopBreakdown.ownerSourceReadMs += startupProfile.roundMs(performance.now() - ownerSourceReadStartedAt);
         }
         const startedAt = performance.now();
-        attrExpressionRewrite = buildComponentExpressionRewrite(ownerPath, ownerSource, ownerIr, compilerOpts, compilerBin, templateExpressionCache, expressionRewriteMetrics);
+        attrExpressionRewrite = buildComponentExpressionRewrite(ownerIr, expressionRewriteMetrics);
         pageComponentLoopBreakdown.ownerExpressionRewriteBuildMs += startupProfile.roundMs(performance.now() - startedAt);
         componentExpressionRewriteCache.set(ownerPath, attrExpressionRewrite);
     }
-    let attrScopeRewrite = componentScopeRewriteCache.get(ownerPath);
-    if (!attrScopeRewrite) {
-        const startedAt = performance.now();
-        attrScopeRewrite = buildScopedIdentifierRewrite(ownerIr);
-        pageComponentLoopBreakdown.ownerScopeRewriteBuildMs += startupProfile.roundMs(performance.now() - startedAt);
-        componentScopeRewriteCache.set(ownerPath, attrScopeRewrite);
-    }
-    return { attrExpressionRewrite, attrScopeRewrite };
+    return { attrExpressionRewrite };
 }
-function resolveInstanceState({ useIsolatedInstance, compIr, compPath, componentSource, compilerOpts, compilerBin, templateExpressionCache, expressionRewriteMetrics, expressionRewrite, startupProfile, pagePhase, componentInstanceCounter }) {
+function resolveInstanceState({ useIsolatedInstance, compIr, expressionRewriteMetrics, expressionRewrite, startupProfile, pagePhase, componentInstanceCounter }) {
     if (!useIsolatedInstance) {
         return {
             instanceIr: compIr,
@@ -123,7 +109,7 @@ function resolveInstanceState({ useIsolatedInstance, compIr, compPath, component
     const cloned = cloneComponentIrForInstance(compIr, componentInstanceCounter, extractDeclaredIdentifiers, resolveStateKeyFromBindings);
     pagePhase.cloneMs += startupProfile.roundMs(performance.now() - cloneStartedAt);
     const instanceRewriteStartedAt = performance.now();
-    const instanceRewrite = buildComponentExpressionRewrite(compPath, componentSource, cloned.ir, compilerOpts, compilerBin, templateExpressionCache, expressionRewriteMetrics);
+    const instanceRewrite = buildComponentExpressionRewrite(cloned.ir, expressionRewriteMetrics);
     pagePhase.instanceRewriteMs += startupProfile.roundMs(performance.now() - instanceRewriteStartedAt);
     return {
         instanceIr: cloned.ir,
@@ -132,12 +118,11 @@ function resolveInstanceState({ useIsolatedInstance, compIr, compPath, component
         componentInstanceCounter: componentInstanceCounter + 1
     };
 }
-export async function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOwnerSource, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, templateExpressionCache, expressionRewriteMetrics, startupProfile }) {
+export async function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOwnerSource, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, expressionRewriteMetrics, startupProfile }) {
     if (componentOccurrences.length === 0) {
         return {
             pageOwnerCompileMs: 0,
-            pageOwnerExpressionRewrite: createEmptyExpressionRewrite(),
-            pageOwnerScopeRewrite: createEmptyScopeRewrite()
+            pageOwnerExpressionRewrite: createEmptyExpressionRewrite()
         };
     }
     await cooperativeYield();
@@ -146,12 +131,10 @@ export async function buildPageOwnerContext({ componentOccurrences, sourceFile,
     const pageOwnerCompileMs = startupProfile.roundMs(performance.now() - ownerStartedAt);
     return {
         pageOwnerCompileMs,
-        pageOwnerExpressionRewrite: buildComponentExpressionRewrite(sourceFile, pageOwnerSource, pageOwnerIr, compilerOpts, compilerBin, templateExpressionCache, expressionRewriteMetrics),
-        pageOwnerScopeRewrite: buildScopedIdentifierRewrite(pageOwnerIr)
+        pageOwnerExpressionRewrite: buildComponentExpressionRewrite(pageOwnerIr, expressionRewriteMetrics)
     };
 }
-export async function runPageComponentLoop({ componentOccurrences, occurrenceCountByPath, sourceFile, registry, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, startupProfile, compilerTotals, emitCompilerWarning, componentIrCache, componentDocumentModeCache, componentExpressionRewriteCache, templateExpressionCache, expressionRewriteMetrics, pageOwnerExpressionRewrite, pageOwnerScopeRewrite, pageIr, pageIrMergeCache, seenStaticImports, pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, knownRefKeys, componentOccurrencePlans, pagePhase, pageBindingResolutionBreakdown, pageMergeBreakdown, pageComponentLoopBreakdown, hoistedCodeTransformCache, pageStats }) {
-    const componentScopeRewriteCache = new Map();
+export async function runPageComponentLoop({ componentOccurrences, occurrenceCountByPath, sourceFile, registry, compilerOpts, compilerBin, timedRunCompiler, cooperativeYield, startupProfile, compilerTotals, emitCompilerWarning, componentIrCache, componentDocumentModeCache, componentExpressionRewriteCache, expressionRewriteMetrics, pageOwnerExpressionRewrite, pageIr, pageIrMergeCache, seenStaticImports, pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, knownRefKeys, componentOccurrencePlans, imagePropsLiterals, pagePhase, pageBindingResolutionBreakdown, pageMergeBreakdown, pageComponentLoopBreakdown, hoistedCodeTransformCache, pageStats }) {
     let componentInstanceCounter = 0;
     for (const occurrence of componentOccurrences) {
         await cooperativeYield();
@@ -186,17 +169,13 @@ export async function runPageComponentLoop({ componentOccurrences, occurrenceCou
         });
         const expressionRewrite = resolveComponentExpressionRewrite({
             compPath,
-            componentSource,
             compIr,
-            compilerOpts,
-            compilerBin,
-            templateExpressionCache,
             expressionRewriteMetrics,
             componentExpressionRewriteCache,
             pageComponentLoopBreakdown,
             startupProfile
         });
-        const { attrExpressionRewrite, attrScopeRewrite } = await resolveOwnerRewriteContext({
+        const { attrExpressionRewrite } = await resolveOwnerRewriteContext({
             occurrence,
             sourceFile,
             compilerOpts,
@@ -205,26 +184,23 @@ export async function runPageComponentLoop({ componentOccurrences, occurrenceCou
             cooperativeYield,
             componentIrCache,
             componentExpressionRewriteCache,
-            componentScopeRewriteCache,
-            templateExpressionCache,
             expressionRewriteMetrics,
             startupProfile,
             compilerTotals,
             emitCompilerWarning,
             pageComponentLoopBreakdown,
             pageStats,
-            pageOwnerExpressionRewrite,
-            pageOwnerScopeRewrite
+            pageOwnerExpressionRewrite
         });
+        if (compName === 'Image') {
+            imagePropsLiterals.push(renderPropsLiteralFromAttrs(occurrence.attrs || '', {
+                expressionRewrite: attrExpressionRewrite
+            }));
+        }
         const useIsolatedInstance = occurrenceCount > 1;
         const instanceState = resolveInstanceState({
             useIsolatedInstance,
             compIr,
-            compPath,
-            componentSource,
-            compilerOpts,
-            compilerBin,
-            templateExpressionCache,
             expressionRewriteMetrics,
             expressionRewrite,
             startupProfile,
@@ -239,8 +215,7 @@ export async function runPageComponentLoop({ componentOccurrences, occurrenceCou
             documentMode: isDocMode,
             componentAttrs: typeof occurrence.attrs === 'string' ? occurrence.attrs : '',
             componentAttrsRewrite: {
-                expressionRewrite: attrExpressionRewrite,
-                scopeRewrite: attrScopeRewrite
+                expressionRewrite: attrExpressionRewrite
             }
         }, seenStaticImports, knownRefKeys, pageIrMergeCache, pageMergeBreakdown, hoistedCodeTransformCache);
         pagePhase.mergeMs += startupProfile.roundMs(performance.now() - mergeStartedAt);

package/dist/build/page-ir-normalization.d.ts

@@ -10,14 +10,6 @@ export function rewriteRefBindingIdentifiers(pageIr: object, preferredKeys?: Set
  * @param {Set<string>} ambiguous
  */
 export function applyExpressionRewrites(pageIr: object, expressionMap: Map<string, string>, bindingMap: Map<string, object>, ambiguous: Set<string>): void;
-/**
- * @param {object} pageIr
- * @param {object} scopeRewrite
- * @param {Record<string, number> | null} [scopedMetrics]
- */
-export function applyScopedIdentifierRewrites(pageIr: object, scopeRewrite: object, scopedMetrics?: Record<string, number> | null): void;
-export function synthesizeSignalBackedCompiledExpressions(pageIr: any): void;
-export function normalizeExpressionBindingDependencies(pageIr: any): void;
 export function normalizeExpressionPayload(pageIr: any): void;
 export function normalizeHoistedSourcePayload(pageIr: any): void;
 export function rewriteLegacyMarkupIdentifiers(pageIr: any): void;