@zenithbuild/cli 0.7.3 → 0.7.4

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;

package/dist/build/page-ir-normalization.js

@@ -1,4 +1,3 @@
-import { rewritePropsExpression } from './scoped-identifier-rewrite.js';
 import { resolveStateKeyFromBindings } from './expression-rewrites.js';
 import { expandScopedShorthandPropertiesInSource, normalizeTypeScriptExpression } from './typescript-expression-utils.js';
 /**
@@ -69,236 +68,6 @@ export function applyExpressionRewrites(pageIr, expressionMap, bindingMap, ambig
         }
     }
 }
-/**
- * @param {object} pageIr
- * @param {object} scopeRewrite
- * @param {Record<string, number> | null} [scopedMetrics]
- */
-export function applyScopedIdentifierRewrites(pageIr, scopeRewrite, scopedMetrics = null) {
-    if (!Array.isArray(pageIr?.expressions) || pageIr.expressions.length === 0) {
-        return;
-    }
-    const bindings = Array.isArray(pageIr.expression_bindings) ? pageIr.expression_bindings : [];
-    const scopeMap = scopeRewrite?.map instanceof Map ? scopeRewrite.map : null;
-    const scopeAmbiguous = scopeRewrite?.ambiguous instanceof Set ? scopeRewrite.ambiguous : null;
-    const scopeCandidates = scopeMap instanceof Map
-        ? new Set([...scopeMap.keys()].filter((identifier) => typeof identifier === 'string'
-            && identifier.length > 0
-            && !(scopeAmbiguous instanceof Set && scopeAmbiguous.has(identifier))))
-        : null;
-    const rewriteContext = { scopeRewrite };
-    const rewriteCache = new Map();
-    const shouldCheckIdentifierCandidate = (charCode, isStart) => {
-        if (charCode === 36 || charCode === 95)
-            return true;
-        if (charCode >= 65 && charCode <= 90)
-            return true;
-        if (charCode >= 97 && charCode <= 122)
-            return true;
-        if (!isStart && charCode >= 48 && charCode <= 57)
-            return true;
-        return false;
-    };
-    const canSkipScopedRewrite = (value) => {
-        if (!(scopeCandidates instanceof Set) || scopeCandidates.size === 0) {
-            return true;
-        }
-        let token = '';
-        for (let index = 0; index < value.length; index++) {
-            const charCode = value.charCodeAt(index);
-            if (shouldCheckIdentifierCandidate(charCode, token.length === 0)) {
-                token += value[index];
-                continue;
-            }
-            if (token.length > 0) {
-                if (scopeCandidates.has(token)) {
-                    return false;
-                }
-                token = '';
-            }
-        }
-        return token.length > 0 ? !scopeCandidates.has(token) : true;
-    };
-    const addScopedMetric = (key, value) => {
-        if (!scopedMetrics || typeof scopedMetrics !== 'object' || !Number.isFinite(value)) {
-            return;
-        }
-        scopedMetrics[key] = (scopedMetrics[key] || 0) + value;
-    };
-    const rewriteScoped = (value) => {
-        if (typeof value !== 'string') {
-            return value;
-        }
-        addScopedMetric('totalValues', 1);
-        const cached = rewriteCache.get(value);
-        if (typeof cached === 'string') {
-            addScopedMetric('cacheHitCount', 1);
-            return cached;
-        }
-        addScopedMetric('cacheMissCount', 1);
-        const missStartedAt = performance.now();
-        const identifierCheckStartedAt = performance.now();
-        const shouldSkip = canSkipScopedRewrite(value);
-        const identifierCheckMs = performance.now() - identifierCheckStartedAt;
-        addScopedMetric('identifierCheckMs', identifierCheckMs);
-        if (shouldSkip) {
-            addScopedMetric('fastSkipCount', 1);
-            addScopedMetric('fastSkipMs', identifierCheckMs);
-            rewriteCache.set(value, value);
-            addScopedMetric('unchangedMissCount', 1);
-            addScopedMetric('cacheMissMs', performance.now() - missStartedAt);
-            return value;
-        }
-        const rewriteCallStartedAt = performance.now();
-        const rewritten = rewritePropsExpression(value, rewriteContext);
-        addScopedMetric('rewriteCallMs', performance.now() - rewriteCallStartedAt);
-        addScopedMetric(rewritten === value ? 'unchangedMissCount' : 'changedMissCount', 1);
-        addScopedMetric('cacheMissMs', performance.now() - missStartedAt);
-        rewriteCache.set(value, rewritten);
-        return rewritten;
-    };
-    for (let index = 0; index < pageIr.expressions.length; index++) {
-        const current = pageIr.expressions[index];
-        if (typeof current === 'string') {
-            pageIr.expressions[index] = rewriteScoped(current);
-        }
-        if (!bindings[index] || typeof bindings[index] !== 'object') {
-            continue;
-        }
-        if (typeof bindings[index].literal === 'string') {
-            bindings[index].literal = rewriteScoped(bindings[index].literal);
-        }
-        if (typeof bindings[index].compiled_expr === 'string') {
-            bindings[index].compiled_expr = rewriteScoped(bindings[index].compiled_expr);
-        }
-    }
-}
-export 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 signalBackedStateIndices = new Set(signals
-        .map((signal) => signal?.state_index)
-        .filter((value) => Number.isInteger(value)));
-    const signalIndexByStateKey = new Map();
-    for (let index = 0; index < signals.length; index++) {
-        const stateIndex = signals[index]?.state_index;
-        const stateKey = Number.isInteger(stateIndex) ? stateBindings[stateIndex]?.key : null;
-        if (typeof stateKey === 'string' && stateKey.length > 0) {
-            signalIndexByStateKey.set(stateKey, index);
-        }
-    }
-    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') {
-            continue;
-        }
-        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'
-                ? pageIr.expressions[index]
-                : null;
-        if (typeof candidate !== 'string' || candidate.trim().length === 0) {
-            continue;
-        }
-        if (Number.isInteger(binding.state_index) &&
-            !signalBackedStateIndices.has(binding.state_index)) {
-            continue;
-        }
-        let rewritten = candidate;
-        const signalIndices = [];
-        for (const [stateKey, signalIndex] of signalIndexByStateKey.entries()) {
-            if (!rewritten.includes(stateKey)) {
-                continue;
-            }
-            const escaped = stateKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            const pattern = new RegExp(`(?<!\\.)\\b${escaped}\\b`, 'g');
-            if (!pattern.test(rewritten)) {
-                continue;
-            }
-            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;
-        if (uniqueSignalIndices.length === 1) {
-            binding.signal_index = uniqueSignalIndices[0];
-            const stateIndex = signals[uniqueSignalIndices[0]]?.state_index;
-            if (Number.isInteger(stateIndex)) {
-                binding.state_index = stateIndex;
-            }
-        }
-    }
-}
-export 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;
-        while ((match = dependencyRe.exec(binding.compiled_expr)) !== null) {
-            const index = Number.parseInt(match[1], 10);
-            if (Number.isInteger(index)) {
-                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 &&
-                signalIndices.every((index) => signals[index]?.state_index === binding.state_index);
-            if (owningSignalIndices.length > 0 && !extractedMatchState) {
-                signalIndices = owningSignalIndices;
-            }
-        }
-        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 = signalIndices;
-        }
-        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)) {
-            const stateIndex = signals[binding.signal_index]?.state_index;
-            if (Number.isInteger(stateIndex)) {
-                binding.state_index = stateIndex;
-            }
-        }
-        if (signalIndices.length === 1) {
-            binding.compiled_expr = binding.compiled_expr.replace(/signalMap\.get\(\d+\)/g, `signalMap.get(${signalIndices[0]})`);
-        }
-    }
-}
 export function normalizeExpressionPayload(pageIr) {
     if (!Array.isArray(pageIr?.expressions) || pageIr.expressions.length === 0) {
         return;
@@ -347,24 +116,34 @@ export function rewriteLegacyMarkupIdentifiers(pageIr) {
         return;
     }
     const bindings = Array.isArray(pageIr.expression_bindings) ? pageIr.expression_bindings : [];
+    function failLegacyMarkup(source) {
+        throw new Error(`[Zenith:Build] Legacy ${LEGACY_MARKUP_IDENT}\`...\` markup syntax is unsupported. ` +
+            'Use embedded markup expressions with embeddedMarkupExpressions: true, or unsafeHTML={value} for explicit raw HTML.');
+    }
     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 (LEGACY_MARKUP_RE.test(pageIr.expressions[i])) {
+                failLegacyMarkup(pageIr.expressions[i]);
+            }
         }
         if (bindings[i] &&
             typeof bindings[i] === 'object' &&
             typeof bindings[i].literal === 'string' &&
             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 (LEGACY_MARKUP_RE.test(bindings[i].literal)) {
+                failLegacyMarkup(bindings[i].literal);
+            }
         }
         if (bindings[i] &&
             typeof bindings[i] === 'object' &&
             typeof bindings[i].compiled_expr === 'string' &&
             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');
+            if (LEGACY_MARKUP_RE.test(bindings[i].compiled_expr)) {
+                failLegacyMarkup(bindings[i].compiled_expr);
+            }
         }
     }
 }

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

@@ -1,9 +1,8 @@
 export function createPageLoopState(): {
     expressionRewriteMetrics: {
         calls: number;
-        cacheHits: number;
-        cacheMisses: number;
-        templateCompileMs: number;
+        compilerOwnedBindings: number;
+        ambiguousBindings: number;
     };
     pagePhaseTotals: {
         occurrenceCollectMs: number;
@@ -78,7 +77,6 @@ export function createPageLoopState(): {
     componentIrCache: Map<any, any>;
     componentDocumentModeCache: Map<any, any>;
     componentExpressionRewriteCache: Map<any, any>;
-    templateExpressionCache: Map<any, any>;
     hoistedCodeTransformCache: {
         transpileToJs: Map<any, any>;
         deferRuntime: Map<any, any>;
@@ -88,7 +86,6 @@ export function createPageLoopCaches(): {
     componentIrCache: Map<any, any>;
     componentDocumentModeCache: Map<any, any>;
     componentExpressionRewriteCache: Map<any, any>;
-    templateExpressionCache: Map<any, any>;
     hoistedCodeTransformCache: {
         transpileToJs: Map<any, any>;
         deferRuntime: Map<any, any>;
@@ -97,9 +94,8 @@ export function createPageLoopCaches(): {
 export function createPageLoopExecutionState(): {
     expressionRewriteMetrics: {
         calls: number;
-        cacheHits: number;
-        cacheMisses: number;
-        templateCompileMs: number;
+        compilerOwnedBindings: number;
+        ambiguousBindings: number;
     };
     pagePhaseTotals: {
         occurrenceCollectMs: number;
@@ -173,11 +169,12 @@ export function createPageLoopExecutionState(): {
     envelopes: never[];
 };
 export function preparePageIrForMerge(pageIr: any): void;
-export function applyServerEnvelopeToPageIr({ pageIr, composedServer, hasGuard, hasLoad, entry, srcDir, sourceFile }: {
+export function applyServerEnvelopeToPageIr({ pageIr, composedServer, hasGuard, hasLoad, hasAction, entry, srcDir, sourceFile }: {
     pageIr: any;
     composedServer: any;
     hasGuard: any;
     hasLoad: any;
+    hasAction: any;
     entry: any;
     srcDir: any;
     sourceFile: any;

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

@@ -11,7 +11,6 @@ export function createPageLoopCaches() {
         componentIrCache: new Map(),
         componentDocumentModeCache: new Map(),
         componentExpressionRewriteCache: new Map(),
-        templateExpressionCache: new Map(),
         hoistedCodeTransformCache: {
             transpileToJs: new Map(),
             deferRuntime: new Map()
@@ -22,9 +21,8 @@ export function createPageLoopExecutionState() {
     return {
         expressionRewriteMetrics: {
             calls: 0,
-            cacheHits: 0,
-            cacheMisses: 0,
-            templateCompileMs: 0
+            compilerOwnedBindings: 0,
+            ambiguousBindings: 0
         },
         pagePhaseTotals: createPagePhaseTotals(),
         occurrenceApplyPhaseTotals: createOccurrenceApplyPhaseTotals(),
@@ -48,22 +46,25 @@ export function preparePageIrForMerge(pageIr) {
     pageIr.hoisted.state = pageIr.hoisted.state || [];
     pageIr.hoisted.code = pageIr.hoisted.code || [];
 }
-export function applyServerEnvelopeToPageIr({ pageIr, composedServer, hasGuard, hasLoad, entry, srcDir, sourceFile }) {
+export function applyServerEnvelopeToPageIr({ pageIr, composedServer, hasGuard, hasLoad, hasAction, entry, srcDir, sourceFile }) {
     if (composedServer.serverScript) {
-        pageIr.server_script = composedServer.serverScript;
+        const { has_action: _unusedHasAction, ...serverScript } = composedServer.serverScript;
+        pageIr.server_script = serverScript;
         pageIr.prerender = composedServer.serverScript.prerender === true;
         if (pageIr.ssr_data === undefined) {
             pageIr.ssr_data = null;
         }
     }
-    if (pageIr.prerender === true && (hasGuard || hasLoad)) {
+    if (pageIr.prerender === true && (hasGuard || hasLoad || hasAction)) {
         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.');
+            'Cannot prerender a static route with a `guard`, `load`, or `action` function.');
     }
     pageIr.has_guard = hasGuard;
     pageIr.has_load = hasLoad;
+    pageIr.has_action = hasAction;
     pageIr.guard_module_ref = composedServer.guardPath ? relative(srcDir, composedServer.guardPath).replaceAll('\\', '/') : null;
     pageIr.load_module_ref = composedServer.loadPath ? relative(srcDir, composedServer.loadPath).replaceAll('\\', '/') : null;
+    pageIr.action_module_ref = composedServer.actionPath ? relative(srcDir, composedServer.actionPath).replaceAll('\\', '/') : null;
     preparePageIrForMerge(pageIr);
 }
 export function buildOccurrenceCountByPath(componentOccurrences) {