@zenithbuild/cli 0.7.11 → 0.7.12

package/README.md

@@ -19,7 +19,7 @@ The command-line interface for developing and building Zenith applications.
 - `zenith build`
 - `zenith preview`
 
-It does not ship a public plugin-management surface.
+It ships a minimal V1 plugin surface for config-time normalization only.
 
 ## Features
 
@@ -41,9 +41,18 @@ Current top-level `zenith.config.js` keys:
 - `adapter`
 - `strictDomLints`
 - `images`
+- `plugins`
 
 There is no separate `assetPrefix` config. Public framework asset URLs follow `basePath`.
 
+`plugins` behavior:
+
+- Plugins are added in `zenith.config.js` with `plugins: [authPlugin(), mdxPlugin()]`.
+- V1 plugins must be named objects and may only provide a `config()` hook.
+- V1 plugin config patches are shallow top-level patches; nested objects such as `images` replace that config object instead of deep-merging.
+- V1 plugins cannot transform files, register middleware, mutate routes/security, or install compiler/bundler/dev-server hooks.
+- Global middleware is separate Lane 2 work.
+
 `pagesDir` resolution:
 
 - If `pagesDir` is set, the CLI uses that path relative to the project root.

package/dist/adapters/adapter-netlify-static.d.ts

@@ -1,5 +1,2 @@
-export namespace netlifyStaticAdapter {
-    let name: string;
-    function validateRoutes(manifest: any): void;
-    function adapt(options: any): Promise<void>;
-}
+import type { AdapterDriver } from './adapter-types.js';
+export declare const netlifyStaticAdapter: AdapterDriver;

package/dist/adapters/adapter-netlify.d.ts

@@ -1,5 +1,2 @@
-export namespace netlifyAdapter {
-    let name: string;
-    function validateRoutes(manifest: any): void;
-    function adapt(options: any): Promise<void>;
-}
+import type { AdapterDriver } from './adapter-types.js';
+export declare const netlifyAdapter: AdapterDriver;

package/dist/adapters/adapter-netlify.js

@@ -2,7 +2,7 @@ import { cp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { prependBasePath } from '../base-path.js';
 import { compareRouteSpecificity } from '../server/resolve-request-route.js';
-import { copyHostedPageRuntime } from './copy-hosted-page-runtime.js';
+import { copyHostedGlobalMiddlewareRuntime, copyHostedPageRuntime } from './copy-hosted-page-runtime.js';
 import { createNetlifyBasePathAssetRules, createNetlifyImageEndpointRule, createNetlifyRewriteRules } from './route-rules.js';
 import { validateHostedResourceRoutes } from './validate-hosted-resource-routes.js';
 function buildNetlifyServerRules(route, basePath = '/') {
@@ -32,13 +32,17 @@ function buildNetlifyServerRules(route, basePath = '/') {
     const query = route.params.map((param) => `__zenith_param_${param}=:${param}`).join('&');
     return [`${prependBasePath(basePath, sourcePath)} ${destination}?${query} 200!`];
 }
-function createFunctionSource(route) {
+function createFunctionSource(route, globalMiddlewareModulePath) {
+    const globalMiddlewarePathExpression = globalMiddlewareModulePath
+        ? "join(__dirname, '_zenith', 'global-middleware', 'entry.js')"
+        : 'null';
     return [
         "import { fileURLToPath } from 'node:url';",
         "import { dirname, join } from 'node:path';",
         "import { renderResourceRouteRequest, renderRouteRequest, extractInternalParams } from './_zenith/runtime/route-render.js';",
         '',
         'const __dirname = dirname(fileURLToPath(import.meta.url));',
+        `const globalMiddlewareModulePath = ${globalMiddlewarePathExpression};`,
         `const route = ${JSON.stringify(route, null, 2)};`,
         '',
         'function createHostedUnsupportedResponse(message) {',
@@ -52,7 +56,8 @@ function createFunctionSource(route) {
         '      request,',
         '      route,',
         '      params,',
-        `      routeModulePath: join(__dirname, '_zenith', 'routes', ${JSON.stringify(route.name)}, 'route', 'entry.js')`,
+        `      routeModulePath: join(__dirname, '_zenith', 'routes', ${JSON.stringify(route.name)}, 'route', 'entry.js'),`,
+        '      globalMiddlewareModulePath',
         '    });',
         "    if (response.headers.has('content-disposition')) {",
         "      return createHostedUnsupportedResponse('Hosted resource downloads are unsupported in this milestone');",
@@ -64,6 +69,7 @@ function createFunctionSource(route) {
         '    route,',
         '    params,',
         `    routeModulePath: join(__dirname, '_zenith', 'routes', ${JSON.stringify(route.name)}, 'route', 'entry.js'),`,
+        '    globalMiddlewareModulePath,',
         `    shellHtmlPath: join(__dirname, '_zenith', 'routes', ${JSON.stringify(route.name)}, 'route', 'page.html'),`,
         `    pageAssetPath: ${route.page_asset_file ? "join(__dirname, '_zenith', 'routes', " + JSON.stringify(route.name) + ", 'route', " + JSON.stringify(route.page_asset_file) + ')' : 'null'},`,
         `    imageManifestPath: ${route.image_manifest_file ? "join(__dirname, '_zenith', 'routes', " + JSON.stringify(route.name) + ", 'route', " + JSON.stringify(route.image_manifest_file) + ')' : 'null'},`,
@@ -91,6 +97,12 @@ function createImageFunctionSource(imagesConfig) {
         ''
     ].join('\n');
 }
+function hasHostedScopedServerData(route) {
+    return route.route_kind !== 'resource' &&
+        route.has_scoped_server_data === true &&
+        Array.isArray(route.scoped_server_data) &&
+        route.scoped_server_data.length > 0;
+}
 async function loadServerManifest(coreOutput) {
     try {
         const parsed = JSON.parse(await readFile(join(coreOutput, 'server', 'manifest.json'), 'utf8'));
@@ -144,11 +156,16 @@ export const netlifyAdapter = {
         await mkdir(functionsDir, { recursive: true });
         await cp(staticDir, publishDir, { recursive: true, force: true });
         await writeFile(join(functionsDir, 'package.json'), '{\n  "type": "module"\n}\n', 'utf8');
-        await copyHostedPageRuntime(options.coreOutput, join(functionsDir, '_zenith'));
+        await copyHostedPageRuntime(options.coreOutput, join(functionsDir, '_zenith'), {
+            includeScopedServerData: serverRoutes.some(hasHostedScopedServerData)
+        });
+        const globalMiddlewareModulePath = serverRoutes.length > 0
+            ? await copyHostedGlobalMiddlewareRuntime(options.coreOutput, join(functionsDir, '_zenith'))
+            : null;
         await writeFile(join(functionsDir, '__zenith_image.mjs'), createImageFunctionSource(options.config?.images || {}), 'utf8');
         for (const route of serverRoutes) {
             await cp(join(options.coreOutput, 'server', 'routes', route.name), join(functionsDir, '_zenith', 'routes', route.name), { recursive: true, force: true });
-            await writeFile(join(functionsDir, `__zenith_${route.name}.mjs`), createFunctionSource(route), 'utf8');
+            await writeFile(join(functionsDir, `__zenith_${route.name}.mjs`), createFunctionSource(route, globalMiddlewareModulePath), 'utf8');
         }
         await writeFile(join(publishDir, '_redirects'), buildRedirectsFile(options.manifest, serverRoutes), 'utf8');
         await writeFile(join(options.outDir, 'netlify.toml'), [

package/dist/adapters/adapter-types.d.ts

@@ -1,21 +1,24 @@
-export const KNOWN_TARGETS: string[];
-export type ZenithTarget = "static" | "static-export" | "vercel-static" | "netlify-static" | "vercel" | "netlify" | "node";
-export type ZenithRenderMode = "prerender" | "server";
-export type ZenithPathKind = "static" | "dynamic";
-export type RouteManifestEntry = {
+export declare const KNOWN_TARGETS: string[];
+export type ZenithTarget = 'static' | 'static-export' | 'vercel-static' | 'netlify-static' | 'vercel' | 'netlify' | 'node';
+export type ZenithRenderMode = 'prerender' | 'server';
+export type ZenithPathKind = 'static' | 'dynamic';
+export interface RouteManifestEntry {
     path: string;
     file: string;
     path_kind: ZenithPathKind;
     render_mode: ZenithRenderMode;
     params: string[];
     export_paths?: string[];
-};
-export type BuildManifest = {
+}
+export interface BuildManifest {
     schema_version: number;
     zenith_version: string;
     target: string;
     base_path: string;
     content_hash: string;
+    global_middleware?: {
+        source_file: string;
+    };
     routes: Array<{
         path: string;
         file: string;
@@ -32,15 +35,31 @@ export type BuildManifest = {
         css: string[];
         vendor: string | null;
     };
-};
-export type AdaptOptions = {
+}
+export interface AdaptOptions {
     coreOutput: string;
     outDir: string;
     manifest: BuildManifest;
     config: object;
-};
-export type ZenithAdapter = {
+}
+export type AdapterResolutionMode = 'adapter' | 'target' | 'legacy';
+export interface AdapterManifestEntry extends RouteManifestEntry {
+    route_kind?: 'page' | 'resource';
+    server_script?: string;
+    server_script_path?: string;
+    has_guard?: boolean;
+    has_load?: boolean;
+    has_action?: boolean;
+}
+export type AdapterRouteManifest = AdapterManifestEntry[];
+export interface AdapterDriver {
     name: string;
-    validateRoutes: (manifest: RouteManifestEntry[]) => void;
+    validateRoutes: (manifest: AdapterRouteManifest) => void;
     adapt: (options: AdaptOptions) => Promise<void>;
-};
+}
+export interface ResolvedBuildAdapter {
+    target: string;
+    adapter: AdapterDriver;
+    mode: AdapterResolutionMode;
+}
+export type ZenithAdapter = AdapterDriver;

package/dist/adapters/adapter-types.js

@@ -7,62 +7,3 @@ export const KNOWN_TARGETS = [
     'netlify',
     'node'
 ];
-/**
- * @typedef {'static' | 'static-export' | 'vercel-static' | 'netlify-static' | 'vercel' | 'netlify' | 'node'} ZenithTarget
- */
-/**
- * @typedef {'prerender' | 'server'} ZenithRenderMode
- */
-/**
- * @typedef {'static' | 'dynamic'} ZenithPathKind
- */
-/**
- * @typedef {{
- *   path: string,
- *   file: string,
- *   path_kind: ZenithPathKind,
- *   render_mode: ZenithRenderMode,
- *   params: string[],
- *   export_paths?: string[]
- * }} RouteManifestEntry
- */
-/**
- * @typedef {{
- *   schema_version: number,
- *   zenith_version: string,
- *   target: string,
- *   base_path: string,
- *   content_hash: string,
- *   routes: Array<{
- *     path: string,
- *     file: string,
- *     path_kind: ZenithPathKind,
- *     render_mode: ZenithRenderMode,
- *     requires_hydration: boolean,
- *     params: string[],
- *     export_paths?: string[],
- *     html: string,
- *     assets: string[]
- *   }>,
- *   assets: {
- *     js: string[],
- *     css: string[],
- *     vendor: string | null
- *   }
- * }} BuildManifest
- */
-/**
- * @typedef {{
- *   coreOutput: string,
- *   outDir: string,
- *   manifest: BuildManifest,
- *   config: object
- * }} AdaptOptions
- */
-/**
- * @typedef {{
- *   name: string,
- *   validateRoutes: (manifest: RouteManifestEntry[]) => void,
- *   adapt: (options: AdaptOptions) => Promise<void>
- * }} ZenithAdapter
- */

package/dist/adapters/adapter-vercel-static.d.ts

@@ -1,5 +1,2 @@
-export namespace vercelStaticAdapter {
-    let name: string;
-    function validateRoutes(manifest: any): void;
-    function adapt(options: any): Promise<void>;
-}
+import type { AdapterDriver } from './adapter-types.js';
+export declare const vercelStaticAdapter: AdapterDriver;

package/dist/adapters/adapter-vercel.d.ts

@@ -1,5 +1,2 @@
-export namespace vercelAdapter {
-    let name: string;
-    function validateRoutes(manifest: any): void;
-    function adapt(options: any): Promise<void>;
-}
+import type { AdapterDriver } from './adapter-types.js';
+export declare const vercelAdapter: AdapterDriver;

package/dist/adapters/adapter-vercel.js

@@ -1,7 +1,7 @@
 import { cp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
-import { basename, join } from 'node:path';
+import { join } from 'node:path';
 import { compareRouteSpecificity } from '../server/resolve-request-route.js';
-import { copyHostedPageRuntime } from './copy-hosted-page-runtime.js';
+import { copyHostedGlobalMiddlewareRuntime, copyHostedPageRuntime } from './copy-hosted-page-runtime.js';
 import { createVercelBasePathAssetRoutes, createVercelImageEndpointRoute, createVercelRouteSource } from './route-rules.js';
 import { validateHostedResourceRoutes } from './validate-hosted-resource-routes.js';
 function buildVercelServerDest(route) {
@@ -53,13 +53,17 @@ function createImageFunctionSource(imagesConfig) {
         ''
     ].join('\n');
 }
-function createFunctionSource(route) {
+function createFunctionSource(route, globalMiddlewareModulePath) {
+    const globalMiddlewarePathExpression = globalMiddlewareModulePath
+        ? "join(__dirname, 'global-middleware', 'entry.js')"
+        : 'null';
     return [
         "import { fileURLToPath } from 'node:url';",
         "import { dirname, join } from 'node:path';",
         "import { renderResourceRouteRequest, renderRouteRequest, extractInternalParams } from './runtime/route-render.js';",
         '',
         'const __dirname = dirname(fileURLToPath(import.meta.url));',
+        `const globalMiddlewareModulePath = ${globalMiddlewarePathExpression};`,
         `const route = ${JSON.stringify(route, null, 2)};`,
         '',
         'function createHostedUnsupportedResponse(message) {',
@@ -74,7 +78,8 @@ function createFunctionSource(route) {
         '        request,',
         '        route,',
         '        params,',
-        `        routeModulePath: join(__dirname, 'routes', ${JSON.stringify(route.name)}, 'route', 'entry.js')`,
+        `        routeModulePath: join(__dirname, 'routes', ${JSON.stringify(route.name)}, 'route', 'entry.js'),`,
+        '        globalMiddlewareModulePath',
         '      });',
         "      if (response.headers.has('content-disposition')) {",
         "        return createHostedUnsupportedResponse('Hosted resource downloads are unsupported in this milestone');",
@@ -86,6 +91,7 @@ function createFunctionSource(route) {
         '      route,',
         '      params,',
         `      routeModulePath: join(__dirname, 'routes', ${JSON.stringify(route.name)}, 'route', 'entry.js'),`,
+        '      globalMiddlewareModulePath,',
         `      shellHtmlPath: join(__dirname, 'routes', ${JSON.stringify(route.name)}, 'route', 'page.html'),`,
         `      pageAssetPath: ${route.page_asset_file ? "join(__dirname, 'routes', " + JSON.stringify(route.name) + ", 'route', " + JSON.stringify(route.page_asset_file) + ')' : 'null'},`,
         `      imageManifestPath: ${route.image_manifest_file ? "join(__dirname, 'routes', " + JSON.stringify(route.name) + ", 'route', " + JSON.stringify(route.image_manifest_file) + ')' : 'null'},`,
@@ -96,6 +102,12 @@ function createFunctionSource(route) {
         ''
     ].join('\n');
 }
+function hasHostedScopedServerData(route) {
+    return route.route_kind !== 'resource' &&
+        route.has_scoped_server_data === true &&
+        Array.isArray(route.scoped_server_data) &&
+        route.scoped_server_data.length > 0;
+}
 async function loadServerManifest(coreOutput) {
     try {
         const parsed = JSON.parse(await readFile(join(coreOutput, 'server', 'manifest.json'), 'utf8'));
@@ -137,10 +149,13 @@ export const vercelAdapter = {
         for (const route of serverRoutes) {
             const functionDir = join(options.outDir, 'functions', '__zenith', `${route.name}.func`);
             await mkdir(functionDir, { recursive: true });
-            await copyHostedPageRuntime(options.coreOutput, functionDir);
+            await copyHostedPageRuntime(options.coreOutput, functionDir, {
+                includeScopedServerData: hasHostedScopedServerData(route)
+            });
+            const globalMiddlewareModulePath = await copyHostedGlobalMiddlewareRuntime(options.coreOutput, functionDir);
             await cp(join(options.coreOutput, 'server', 'routes', route.name), join(functionDir, 'routes', route.name), { recursive: true, force: true });
             await writeFile(join(functionDir, 'package.json'), '{\n  "type": "module"\n}\n', 'utf8');
-            await writeFile(join(functionDir, 'index.js'), createFunctionSource(route), 'utf8');
+            await writeFile(join(functionDir, 'index.js'), createFunctionSource(route, globalMiddlewareModulePath), 'utf8');
             await writeFile(join(functionDir, '.vc-config.json'), vercelFunctionConfig(), 'utf8');
         }
         await writeFile(join(options.outDir, 'config.json'), `${JSON.stringify(buildVercelConfig(options.manifest, serverRoutes), null, 2)}\n`, 'utf8');

package/dist/adapters/copy-hosted-page-runtime.d.ts

@@ -1 +1,2 @@
-export function copyHostedPageRuntime(coreOutput: any, targetDir: any): Promise<void>;
+export function copyHostedPageRuntime(coreOutput: any, targetDir: any, options?: {}): Promise<void>;
+export function copyHostedGlobalMiddlewareRuntime(coreOutput: any, targetDir: any): Promise<string | null>;

package/dist/adapters/copy-hosted-page-runtime.js

@@ -1,6 +1,6 @@
-import { cp, mkdir, readFile, writeFile } from 'node:fs/promises';
+import { cp, mkdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { join } from 'node:path';
+import { isAbsolute, join, normalize } from 'node:path';
 import { pathToFileURL } from 'node:url';
 const PACKAGE_REQUIRE = createRequire(import.meta.url);
 const HOSTED_PAGE_RUNTIME_DIRS = ['runtime', 'images', 'auth', 'server-contract'];
@@ -12,6 +12,10 @@ const HOSTED_PAGE_RUNTIME_FILES = [
     'resource-response.js',
     'download-result.js'
 ];
+const INVALID_GLOBAL_MIDDLEWARE_MODULE_PATH_ERROR = '[Zenith:Middleware] Invalid global middleware module path in server manifest.';
+const MISSING_GLOBAL_MIDDLEWARE_RUNTIME_ERROR = '[Zenith:Middleware] Compiled global middleware runtime is missing from server output.';
+const MISSING_SCOPED_RUNTIME_ERROR = '[Zenith:ScopedServerData] Compiled scoped server data runtime is missing from server output.';
+const MISSING_SCOPED_MODULES_ERROR = '[Zenith:ScopedServerData] Compiled scoped server data modules are missing from server output.';
 function createSharpRuntimeSource() {
     const sharpPath = PACKAGE_REQUIRE.resolve('sharp');
     const fallbackUrl = pathToFileURL(sharpPath).href;
@@ -31,7 +35,48 @@ function createSharpRuntimeSource() {
         ''
     ].join('\n');
 }
-export async function copyHostedPageRuntime(coreOutput, targetDir) {
+async function readServerManifest(coreOutput) {
+    try {
+        return JSON.parse(await readFile(join(coreOutput, 'server', 'manifest.json'), 'utf8'));
+    }
+    catch {
+        return null;
+    }
+}
+function normalizeGlobalMiddlewareModulePath(modulePath) {
+    if (typeof modulePath !== 'string' || modulePath.length === 0 || isAbsolute(modulePath) || /^[A-Za-z]:[\\/]/.test(modulePath)) {
+        throw new Error(INVALID_GLOBAL_MIDDLEWARE_MODULE_PATH_ERROR);
+    }
+    if (modulePath.split(/[\\/]+/).includes('..')) {
+        throw new Error(INVALID_GLOBAL_MIDDLEWARE_MODULE_PATH_ERROR);
+    }
+    const normalized = normalize(modulePath).replaceAll('\\', '/');
+    if (normalized === '.' ||
+        normalized.startsWith('../') ||
+        normalized.includes('/../') ||
+        !normalized.startsWith('global-middleware/')) {
+        throw new Error(INVALID_GLOBAL_MIDDLEWARE_MODULE_PATH_ERROR);
+    }
+    return normalized;
+}
+async function assertPathExists(filePath, message) {
+    try {
+        await stat(filePath);
+    }
+    catch {
+        throw new Error(message);
+    }
+}
+async function copyHostedScopedServerDataRuntime(coreOutput, targetDir) {
+    const serverDir = join(coreOutput, 'server');
+    const runtimeRoot = join(serverDir, 'scoped-server-data');
+    const scopedRoot = join(serverDir, 'scoped');
+    await assertPathExists(runtimeRoot, MISSING_SCOPED_RUNTIME_ERROR);
+    await assertPathExists(scopedRoot, MISSING_SCOPED_MODULES_ERROR);
+    await cp(runtimeRoot, join(targetDir, 'scoped-server-data'), { recursive: true, force: true });
+    await cp(scopedRoot, join(targetDir, 'scoped'), { recursive: true, force: true });
+}
+export async function copyHostedPageRuntime(coreOutput, targetDir, options = {}) {
     const serverDir = join(coreOutput, 'server');
     await mkdir(targetDir, { recursive: true });
     for (const name of HOSTED_PAGE_RUNTIME_DIRS) {
@@ -47,4 +92,24 @@ export async function copyHostedPageRuntime(coreOutput, targetDir) {
     const imageServiceSource = await readFile(imageServicePath, 'utf8');
     await writeFile(imageServicePath, imageServiceSource.replace("import sharp from 'sharp';", "import sharp from './sharp-runtime.js';"), 'utf8');
     await writeFile(join(targetDir, 'images', 'sharp-runtime.js'), createSharpRuntimeSource(), 'utf8');
+    if (options.includeScopedServerData === true) {
+        await copyHostedScopedServerDataRuntime(coreOutput, targetDir);
+    }
+}
+export async function copyHostedGlobalMiddlewareRuntime(coreOutput, targetDir) {
+    const manifest = await readServerManifest(coreOutput);
+    const modulePath = manifest?.global_middleware?.module;
+    if (modulePath == null) {
+        return null;
+    }
+    const normalizedModulePath = normalizeGlobalMiddlewareModulePath(modulePath);
+    const serverDir = join(coreOutput, 'server');
+    const middlewareRoot = join(serverDir, 'global-middleware');
+    await assertPathExists(middlewareRoot, MISSING_GLOBAL_MIDDLEWARE_RUNTIME_ERROR);
+    await assertPathExists(join(serverDir, normalizedModulePath), MISSING_GLOBAL_MIDDLEWARE_RUNTIME_ERROR);
+    await cp(middlewareRoot, join(targetDir, 'global-middleware'), {
+        recursive: true,
+        force: true
+    });
+    return normalizedModulePath;
 }

package/dist/adapters/resolve-adapter.d.ts

@@ -1,5 +1,7 @@
-export function resolveBuildAdapter(config?: {}): {
-    target: any;
-    adapter: any;
-    mode: string;
+import type { ResolvedBuildAdapter } from './adapter-types.js';
+type BuildAdapterConfig = {
+    target?: unknown;
+    adapter?: unknown;
 };
+export declare function resolveBuildAdapter(config?: BuildAdapterConfig): ResolvedBuildAdapter;
+export {};

package/dist/build/expression-rewrites.d.ts

@@ -9,7 +9,8 @@
  *     signal_indices: number[],
  *     state_index: number | null,
  *     component_instance: string | null,
- *     component_binding: string | null
+ *     component_binding: string | null,
+ *     scoped_data_key: string | null
  *   }>,
  *   signals: Array<{ id?: number, kind?: string, state_index?: number }>,
  *   stateBindings: Array<{ key?: string, value?: string }>,
@@ -26,6 +27,7 @@ export function buildComponentExpressionRewrite(compIr: object, rewriteMetrics?:
         state_index: number | null;
         component_instance: string | null;
         component_binding: string | null;
+        scoped_data_key: string | null;
     }>;
     signals: Array<{
         id?: number;

package/dist/build/expression-rewrites.js

@@ -11,7 +11,8 @@ import { rewriteCompilerSignalMapReferences } from './compiler-signal-expression
  *     signal_indices: number[],
  *     state_index: number | null,
  *     component_instance: string | null,
- *     component_binding: string | null
+ *     component_binding: string | null,
+ *     scoped_data_key: string | null
  *   }>,
  *   signals: Array<{ id?: number, kind?: string, state_index?: number }>,
  *   stateBindings: Array<{ key?: string, value?: string }>,
@@ -60,6 +61,11 @@ export function buildComponentExpressionRewrite(compIr, rewriteMetrics = null) {
                 component_binding: typeof binding.component_binding === 'string' ? binding.component_binding : null
             }
             : null;
+        if (normalizedBinding &&
+            typeof binding.scoped_data_key === 'string' &&
+            binding.scoped_data_key.length > 0) {
+            normalizedBinding.scoped_data_key = binding.scoped_data_key;
+        }
         out.sequence.push({ raw, rewritten, binding: normalizedBinding });
         if (!out.ambiguous.has(raw) && normalizedBinding) {
             const existingBinding = out.bindings.get(raw);
@@ -197,7 +203,10 @@ export function resolveRewrittenBindingMetadata(pageBindingContext, componentRew
         signal_indices: [],
         state_index: null,
         component_instance: typeof binding.component_instance === 'string' ? binding.component_instance : null,
-        component_binding: typeof binding.component_binding === 'string' ? binding.component_binding : null
+        component_binding: typeof binding.component_binding === 'string' ? binding.component_binding : null,
+        scoped_data_key: typeof binding.scoped_data_key === 'string' && binding.scoped_data_key.length > 0
+            ? binding.scoped_data_key
+            : null
     };
     if (typeof next.compiled_expr === 'string' && next.compiled_expr.includes('signalMap.get(')) {
         const remapStartedAt = performance.now();
@@ -334,6 +343,9 @@ function measureBindingSpecificity(binding, raw) {
     if (typeof binding.component_binding === 'string' && binding.component_binding.length > 0) {
         score += 1;
     }
+    if (typeof binding.scoped_data_key === 'string' && binding.scoped_data_key.length > 0) {
+        score += 1;
+    }
     return score;
 }
 /**

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

@@ -29,6 +29,7 @@ export function buildPageOwnerContext({ componentOccurrences, sourceFile, pageOw
             state_index: number | null;
             component_instance: string | null;
             component_binding: string | null;
+            scoped_data_key: string | null;
         }>;
         signals: Array<{
             id?: number;