@nativescript/vite 8.0.0-alpha.9 → 8.0.0-dev.0

package/hmr/server/framework-strategy.d.ts

@@ -1,5 +1,7 @@
-import type { ViteDevServer } from 'vite';
+import type { HmrContext, ViteDevServer } from 'vite';
+import type { ServerResponse } from 'node:http';
 import type { WebSocketServer } from 'ws';
+import type { NsHotUpdateContext } from './websocket-hot-update.js';
 export interface FrameworkProcessFileContext {
     filePath: string;
     server: ViteDevServer;
@@ -39,29 +41,198 @@ export interface FrameworkRegistryContext {
 export interface FrameworkCleanContext {
     code: string;
 }
+/**
+ * Inputs for {@link FrameworkServerStrategy.rewriteServedModule}, mirroring the
+ * arguments the `/ns/m` served-module pipeline passes to `rewriteImports` /
+ * `prepareAngularEntryForDevice` today (the angular/else fork in
+ * `websocket-ns-m.ts`).
+ */
+export interface FrameworkServedModuleContext {
+    /** Resolved module specifier / URL being served (`resolvedCandidate || spec`). */
+    moduleId: string;
+    sfcFileMap: Map<string, string>;
+    depFileMap: Map<string, string>;
+    projectRoot: string;
+    serverOrigin: string;
+    verbose: boolean;
+}
+/**
+ * Inputs for {@link FrameworkServerStrategy.interceptModuleRequest}: the raw
+ * `/ns/m` request BEFORE spec resolution. `isLiveComponentUpdateFetch` is the
+ * live-broadcast gate injected from the WebSocket plugin's component-update
+ * ledger (Angular; undefined for other flavors).
+ */
+export interface FrameworkModuleRequestContext {
+    urlObj: URL;
+    res: ServerResponse;
+    next: () => void;
+    isLiveComponentUpdateFetch?: (componentId: string, timestamp: number) => boolean;
+}
+/**
+ * Inputs for {@link FrameworkServerStrategy.registerRoutes}. A framework that
+ * owns dev-only HTTP endpoints (e.g. Vue's `/ns/sfc*`) registers them here;
+ * frameworks without extra endpoints leave the hook undefined (no-op default).
+ *
+ * Carries everything Vue's `registerSfcHandlers` needs (its
+ * `RegisterSfcHandlersOptions` shape): the dev server, plugin state
+ * (`sfcFileMap`/`depFileMap`/`appVirtualWithSlash`), the live graph-version
+ * accessor, and the active strategy. `wss` is included for parity with the
+ * other route registrars (the SFC handlers don't consult it today).
+ */
+export interface FrameworkRouteContext {
+    server: ViteDevServer;
+    wss: WebSocketServer | null;
+    sfcFileMap: Map<string, string>;
+    depFileMap: Map<string, string>;
+    verbose: boolean;
+    appVirtualWithSlash: string;
+    getGraphVersion(): number;
+    getStrategy(): FrameworkServerStrategy;
+}
 export interface FrameworkServerStrategy {
     readonly flavor: string;
     matchesFile(id: string): boolean;
+    /** Framework-specific pre-clean phase (remove virtual style imports, etc.). */
+    preClean?(code: string): string;
+    /** Rewrite framework runtime imports to vendor bundle. */
+    rewriteFrameworkImports?(code: string): string;
+    /** Framework-specific post-clean phase (strip HMR helpers, etc.). */
+    postClean?(code: string): string;
     /**
-     * Framework-specific pre-clean phase (remove virtual style imports, etc.).
+     * Collapse framework-specific HTTP endpoint imports to their canonical
+     * (unversioned) URLs. Module identity is the URL; freshness is driven by
+     * explicit eviction, never URL variation. Versioned inbound shapes from
+     * stale cached device code (e.g. `/ns/sfc/<ver>/…`) are stripped here.
      */
-    preClean(code: string): string;
+    canonicalizeFrameworkImports?(code: string, origin: string): string;
+    /** Optional vendor rewrite hook (e.g. map framework helper imports to vendor). */
+    rewriteVendorSpec?(code: string, origin: string, version: number): string;
     /**
-     * Rewrite framework runtime imports to vendor bundle.
+     * Full per-framework `handleHotUpdate` implementation. Every flavor owns one:
+     * the WebSocket plugin's `handleHotUpdate` Vite hook calls it directly, and
+     * the implementation runs the shared {@link NsHotUpdateContext}-driven
+     * `runHotUpdatePrologue` followed by its own framework tail.
      */
-    rewriteFrameworkImports(code: string): string;
+    handleHotUpdate?(ctx: HmrContext, deps: NsHotUpdateContext): Promise<HmrContext['modules'] | void>;
     /**
-     * Framework-specific post-clean phase (strip HMR helpers, etc.).
+     * Handle a Vite custom event sent FROM the device (`import.meta.hot.send`
+     * arrives on the `/ns-hmr` socket as `{ type: 'custom', event, data }`).
+     * Frameworks use this for runtime→server recovery signals the shared
+     * message pump has no business interpreting. Angular implements it for
+     * `angular:invalidate` — Angular core sends that when an in-place
+     * `ɵɵreplaceMetadata` apply THROWS (see `executeWithInvalidateFallback`),
+     * expecting the dev server to force a full reload the way
+     * `@angular/build`'s Vite server does on web. Defaults to ignore.
      */
-    postClean(code: string): string;
+    handleClientCustomEvent?(ctx: {
+        event: string;
+        data: unknown;
+        server: ViteDevServer;
+    }, deps: NsHotUpdateContext): Promise<void> | void;
     /**
-     * Ensure framework-specific HTTP endpoints/imports are versioned for cache-busting.
+     * When `true`, the per-module graph delta is NOT broadcast inline during a
+     * hot update (the framework drives its own re-fetch/patch instead — Angular
+     * & Solid). Defaults to `false` → delta is broadcast (today's TS/Vue path).
      */
-    ensureVersionedImports(code: string, origin: string, version: number): string;
+    readonly deferDeltaBroadcast?: boolean;
     /**
-     * Optional vendor rewrite hook (e.g. map framework helper imports to vendor).
+     * When this returns `true` for the changed file, the shared prologue SKIPS
+     * its default module-graph delta upsert — the framework's own
+     * `handleHotUpdate` tail re-queries the graph and drives the update itself
+     * (Angular HTML templates: Analog's in-place swap or the NS reboot path).
+     * Defaults to no-skip (the prologue always upserts).
      */
-    rewriteVendorSpec?(code: string, origin: string, version: number): string;
+    skipDefaultGraphUpdate?(file: string): boolean;
+    /**
+     * When `true`, the shared prologue does NOT broadcast `ns:css-updates` for a
+     * component-scoped style edit (a non-global `.css`) — the framework's own
+     * `handleHotUpdate` drives the in-place component update instead. For
+     * Angular with Analog `liveReload` active this is essential: Analog emits
+     * `angular:component-update` only while the css's `?direct` module is absent
+     * from the graph, and the prologue's broadcast makes the device fetch
+     * `…?direct=1`, which creates that module and flips Analog to its
+     * (NativeScript-inert) Vite css-update branch on every subsequent edit. The
+     * global app-entry CSS path is unaffected (it is not component-scoped).
+     * Defaults to `false` (every flavor keeps the component-style broadcast).
+     */
+    ownsComponentStyleHmr?(server: ViteDevServer): boolean;
+    /**
+     * Content-file edits (Tailwind scans) that change the generated `app.css`
+     * are normally broadcast as a standalone `ns:css-updates`. Return `true`
+     * when the framework's own update message must carry them instead — the
+     * prologue then hands them to the tail via
+     * {@link HotUpdatePrologueState.deferredCssUpdates} so the device
+     * serializes the CSS with the framework's update cycle instead of racing
+     * it (Angular: a TS edit reboots the root, and the CSS must land inside
+     * that reboot, not against a view tree mid-teardown). Defaults to `false`
+     * (standalone broadcast).
+     */
+    defersContentCssToFrameworkUpdate?(file: string): boolean;
+    /**
+     * Intercept a `/ns/m` request before spec resolution. Return `true` when
+     * the request was fully answered (or delegated downstream via `next()`),
+     * so the shared route stops processing it. Angular implements this for
+     * AnalogJS `/@ng/component` metadata fetches (see
+     * `frameworks/angular/server/ng-component-route.ts`). Defaults to no
+     * interception.
+     */
+    interceptModuleRequest?(ctx: FrameworkModuleRequestContext): boolean;
+    /**
+     * Last-chance export normalization on the final served body (after the
+     * CJS wrap, before URL canonicalization). Vue/Solid/TS implement the
+     * `routes` default-export alias so both `import { routes }` and
+     * `import routes` resolve against a route-config module. Defaults to
+     * identity.
+     */
+    normalizeServedExports?(code: string): string;
+    /**
+     * Override the `/ns/m` served-module import rewrite. Defaults to the shared
+     * `rewriteImports` (today's non-Angular path); Angular overrides with its
+     * entry-preparation pass. Returns the rewritten code.
+     */
+    rewriteServedModule?(code: string, ctx: FrameworkServedModuleContext): string;
+    /**
+     * Patch a served `node_modules` module before device delivery (e.g. Solid's
+     * inline `@solid-refresh` patch). Defaults to identity (code unchanged).
+     * `verbose` mirrors the `/ns/m` plugin's `verbose` option and gates the
+     * server-side diagnostics the inline patch emitted today (the device process
+     * sets `globalThis.__NS_ENV_VERBOSE__`, but the Node server never does).
+     */
+    transformNodeModule?(code: string, moduleId: string, verbose?: boolean): string;
+    /**
+     * Framework SFC post-processing (Vue). Defaults to identity. Mirrors the
+     * `processSfcCode` helper currently injected via the registry context.
+     */
+    processSfcCode?(code: string): string;
+    /**
+     * Register framework-owned dev HTTP endpoints (Vue: `/ns/sfc*`). Defaults to
+     * no-op for frameworks without extra routes.
+     */
+    registerRoutes?(ctx: FrameworkRouteContext): void | Promise<void>;
+    /**
+     * Extra import-map entries for this framework (e.g. Vue → `vue` /
+     * `nativescript-vue`; Solid → `solid-js`). Defaults to none. Replaces the
+     * `addFrameworkEntries` switch in `import-map.ts`.
+     */
+    importMapEntries?(origin: string): Record<string, string>;
+    /**
+     * Extra volatile URL patterns the device runtime must always re-fetch.
+     * Defaults to none (freshness is eviction-driven). Angular supplies
+     * `/@ng/component` — its per-save `t` param mints a fresh module per
+     * recompile, so the previous entry must be evicted on every re-import
+     * or the registry accumulates one stale entry per save.
+     */
+    volatilePatterns?(): string[];
+    /**
+     * Paths (substring match) whose query string IS the module identity and
+     * must be preserved verbatim by the runtime's canonical-key function.
+     * Defaults to none. Angular supplies `/@ng/component` — each
+     * `?c=<id>&t=<ts>` identifies a distinct metadata recompile; stripping
+     * `t` would collapse every HMR fetch onto the boot-time cache key and
+     * `ɵɵreplaceMetadata` would forever replay stale template instructions.
+     * Fed into `configureLoader({ canonicalization.preserveQueryFor })`.
+     */
+    preserveQueryPaths?(): string[];
     processFile(ctx: FrameworkProcessFileContext): Promise<void>;
     buildRegistry(ctx: FrameworkRegistryContext): Promise<void>;
 }

package/hmr/server/hmr-module-graph.d.ts

@@ -0,0 +1,37 @@
+import type { WebSocket, WebSocketServer } from 'ws';
+import type { FrameworkServerStrategy } from './framework-strategy.js';
+export interface GraphModule {
+    id: string;
+    deps: string[];
+    hash: string;
+}
+export interface UpsertOptions {
+    emitDeltaOnInsert?: boolean;
+    broadcastDelta?: boolean;
+    bumpVersion?: boolean;
+}
+export interface HmrModuleGraphDeps {
+    verbose: boolean;
+    strategy: FrameworkServerStrategy;
+    getWss: () => WebSocketServer | null;
+    getPluginRoot: () => string | undefined;
+}
+export declare class HmrModuleGraph {
+    private readonly deps;
+    readonly modules: Map<string, GraphModule>;
+    private readonly txnBatches;
+    private _version;
+    constructor(deps: HmrModuleGraphDeps);
+    get version(): number;
+    get size(): number;
+    get(id: string): GraphModule | undefined;
+    getTxnBatch(version: number): string[];
+    computeHash(content: string): string;
+    normalizeGraphId(raw: string): string;
+    computeTxnOrderForChanged(changedIds: string[]): string[];
+    private fullGraphPayload;
+    emitFullGraph(ws: WebSocket): void;
+    emitDelta(changed: GraphModule[], removed: string[]): void;
+    upsert(rawId: string, code: string, deps: string[], options?: UpsertOptions): GraphModule | undefined;
+    remove(id: string): void;
+}

package/hmr/server/hmr-module-graph.js

@@ -0,0 +1,215 @@
+import { matchesRuntimeGraphModuleId } from './runtime-graph-filter.js';
+import { classifyGraphUpsert, shouldBroadcastGraphUpsertDelta, shouldBumpGraphVersion } from './websocket-graph-upsert.js';
+import { getProjectAppVirtualPath } from '../../helpers/utils.js';
+const APP_VIRTUAL_WITH_SLASH = `${getProjectAppVirtualPath()}/`;
+// The HMR module graph: spec -> { deps, hash } plus a monotonically increasing
+// version that sequences graph broadcasts and transactional HMR batches.
+// Owns delta/full-graph broadcasts to connected clients and the per-version
+// txn batch ordering. The version never appears in served module URLs —
+// module identity is the canonical URL (see CLAUDE.md invariant 4).
+//
+// version starts at 1 and stays stable during cold boot (bulk warm-ups pass
+// bumpVersion:false); it only advances on live edits, so the graph filling in
+// lazily never churns the version.
+export class HmrModuleGraph {
+    constructor(deps) {
+        this.deps = deps;
+        this.modules = new Map();
+        // Transactional HMR batches: version -> ordered list of changed ids for that version.
+        this.txnBatches = new Map();
+        this._version = 1;
+    }
+    get version() {
+        return this._version;
+    }
+    get size() {
+        return this.modules.size;
+    }
+    get(id) {
+        return this.modules.get(id);
+    }
+    getTxnBatch(version) {
+        return this.txnBatches.get(version) || [];
+    }
+    computeHash(content) {
+        let h = 0;
+        for (let i = 0; i < content.length; i++) {
+            h = (h * 31 + content.charCodeAt(i)) | 0;
+        }
+        return ('00000000' + (h >>> 0).toString(16)).slice(-8);
+    }
+    normalizeGraphId(raw) {
+        if (!raw)
+            return raw;
+        let id = raw.split('?')[0].replace(/\\/g, '/');
+        id = id.replace(/^file:\/\//, '');
+        const pluginRoot = this.deps.getPluginRoot();
+        if (pluginRoot) {
+            const rootNorm = pluginRoot.replace(/\\/g, '/');
+            if (id.startsWith(rootNorm)) {
+                id = id.slice(rootNorm.length);
+            }
+        }
+        if (!id.startsWith('/'))
+            id = '/' + id;
+        // Collapse nested app root indicators when present (defensive)
+        const idx = id.indexOf(APP_VIRTUAL_WITH_SLASH);
+        if (idx !== -1)
+            id = id.slice(idx);
+        return id;
+    }
+    // Dependency-closed, topologically sorted list of modules for a set of
+    // changed ids. Only includes application modules we can serve (under the
+    // app virtual root and known framework/.ts/.js entries already in the graph).
+    computeTxnOrderForChanged(changedIds) {
+        const { strategy } = this.deps;
+        const includeAppModule = (id) => matchesRuntimeGraphModuleId(id, APP_VIRTUAL_WITH_SLASH, /\.(ts|js|mjs|tsx|jsx)$/i);
+        const includeExt = (id) => strategy.matchesFile(id) || includeAppModule(id);
+        const isApp = (id) => id.startsWith(APP_VIRTUAL_WITH_SLASH);
+        const roots = changedIds.map((id) => this.normalizeGraphId(id)).filter((id) => this.modules.has(id) && (isApp(id) || strategy.matchesFile(id)) && includeExt(id));
+        const toVisit = new Set();
+        const stack = [...roots];
+        while (stack.length) {
+            const id = stack.pop();
+            if (toVisit.has(id))
+                continue;
+            toVisit.add(id);
+            const m = this.modules.get(id);
+            if (m) {
+                for (const d of m.deps) {
+                    if (!this.modules.has(d))
+                        continue;
+                    if ((isApp(d) || strategy.matchesFile(d)) && includeExt(d) && !toVisit.has(d)) {
+                        stack.push(d);
+                    }
+                }
+            }
+        }
+        // Topological order: deps first (post-order DFS)
+        const ordered = [];
+        const temp = new Set();
+        const perm = new Set();
+        const visit = (id) => {
+            if (perm.has(id))
+                return;
+            if (temp.has(id)) {
+                perm.add(id);
+                return;
+            } // cycle: bail out
+            temp.add(id);
+            const m = this.modules.get(id);
+            if (m) {
+                for (const d of m.deps) {
+                    if (toVisit.has(d))
+                        visit(d);
+                }
+            }
+            temp.delete(id);
+            perm.add(id);
+            ordered.push(id);
+        };
+        for (const id of toVisit)
+            visit(id);
+        return ordered;
+    }
+    fullGraphPayload() {
+        return {
+            type: 'ns:hmr-full-graph',
+            version: this._version,
+            modules: Array.from(this.modules.values()).map((m) => ({
+                id: m.id,
+                deps: m.deps,
+                hash: m.hash,
+            })),
+        };
+    }
+    emitFullGraph(ws) {
+        try {
+            if (this.deps.verbose) {
+                try {
+                    const payload = this.fullGraphPayload();
+                    console.log('[hmr-ws][graph] emitFullGraph version', payload.version, 'modules=', payload.modules.length);
+                    if (payload.modules.length) {
+                        console.log('[hmr-ws][graph] sample module ids', payload.modules.slice(0, 5).map((m) => m.id));
+                    }
+                }
+                catch { }
+            }
+            ws.send(JSON.stringify(this.fullGraphPayload()));
+        }
+        catch { }
+    }
+    emitDelta(changed, removed) {
+        const wss = this.deps.getWss();
+        if (!wss)
+            return;
+        // Record this version's txn batch order
+        try {
+            const changedIds = changed.map((m) => m.id);
+            if (changedIds.length) {
+                const ordered = this.computeTxnOrderForChanged(changedIds);
+                this.txnBatches.set(this._version, ordered);
+                // Keep only the last ~20 versions
+                if (this.txnBatches.size > 20) {
+                    const drop = Array.from(this.txnBatches.keys())
+                        .sort((a, b) => a - b)
+                        .slice(0, this.txnBatches.size - 20);
+                    for (const k of drop)
+                        this.txnBatches.delete(k);
+                }
+            }
+        }
+        catch { }
+        const payload = {
+            type: 'ns:hmr-delta',
+            baseVersion: this._version - 1,
+            newVersion: this._version,
+            changed: changed.map((m) => ({ id: m.id, deps: m.deps, hash: m.hash })),
+            removed,
+        };
+        const json = JSON.stringify(payload);
+        wss.clients.forEach((c) => {
+            try {
+                c.send(json);
+            }
+            catch { }
+        });
+    }
+    upsert(rawId, code, deps, options) {
+        const id = this.normalizeGraphId(rawId);
+        const normDeps = deps
+            .map((d) => this.normalizeGraphId(d))
+            .filter(Boolean)
+            .slice()
+            .sort();
+        const hash = this.computeHash(code);
+        const existing = this.modules.get(id);
+        const classification = classifyGraphUpsert(existing, hash, normDeps);
+        if (classification === 'unchanged')
+            return existing;
+        // Version bumps are only meaningful for live edits — serve-time graph
+        // warm-ups and the initial bulk walk should leave the version stable.
+        const bumpVersion = shouldBumpGraphVersion(classification, options?.bumpVersion !== false);
+        if (bumpVersion) {
+            this._version++;
+        }
+        const gm = { id, deps: normDeps, hash };
+        this.modules.set(id, gm);
+        if (this.deps.verbose) {
+            console.log('[hmr-ws][graph] upsert', { id, deps: normDeps, hash, graphVersion: this._version, classification, bumpVersion });
+            console.log('[hmr-ws][graph] size', this.modules.size);
+        }
+        if (shouldBroadcastGraphUpsertDelta(classification, options?.emitDeltaOnInsert === true, options?.broadcastDelta !== false)) {
+            this.emitDelta([gm], []);
+        }
+        return gm;
+    }
+    remove(id) {
+        if (!this.modules.has(id))
+            return;
+        this.modules.delete(id);
+        this._version++;
+        this.emitDelta([], [id]);
+    }
+}
+//# sourceMappingURL=hmr-module-graph.js.map

package/hmr/server/hmr-module-graph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hmr-module-graph.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/hmr-module-graph.ts"],"names":[],"mappings":"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"}

package/hmr/server/import-map.d.ts

@@ -2,47 +2,58 @@
  * Import Map Generator for NativeScript HMR
  *
  * Generates an import map that the iOS/Android runtime consumes via
- * __nsConfigureRuntime(). This is the single source of truth for module
+ * ns:module configureLoader(). This is the single source of truth for module
  * resolution on the device.
  *
  * Resolution strategy:
- *   Vendor modules (direct project deps bundled by esbuild) → ns-vendor://
- *     Only EXACT specifier entries — no trailing-slash prefixes.
- *     Subpaths of vendor packages (e.g., solid-js/store) are NOT vendor-
- *     resolved; they fall through to HTTP trailing-slash prefixes below.
+ *   Every bare npm specifier → HTTP URL (`/ns/m/node_modules/<pkg>`).
+ *     Package roots in the vendor collection get EXACT entries whose served
+ *     body is a deps-bundle shim (see deps-bundle.ts), so "many specifiers,
+ *     one instance" holds via the single bundle realm — no custom URL scheme.
  *   @nativescript/core → HTTP bridge URL (/ns/core)
- *   All other npm packages (transitive deps, etc.) → HTTP URL (/ns/m/)
- *     Both exact AND trailing-slash prefix entries, so subpath imports
- *     like @nativescript/tanstack-router/solid resolve correctly via HTTP.
+ *   Trailing-slash prefix entries cover subpath imports
+ *     (e.g. @nativescript/tanstack-router/solid) for every package.
  *
- * The runtime's NormalizeViteSpecifier() extracts bare package names from
- * Vite-rewritten paths (e.g. /node_modules/.vite/deps/solid-js.js → solid-js),
- * then looks them up in this map. This ensures ALL imports — regardless of
- * how Vite rewrites them — resolve through a single deterministic path.
+ * The runtime matches map keys literally: it reverse-engineers none of Vite's
+ * rewrites (`/node_modules/.vite/deps/solid-js.js?v=…`, `/@id/…`, `/@fs/…`).
+ * Every specifier form that reaches the device must therefore either be a key
+ * in this map or be rewritten by the server before it is served — the /ns/m
+ * pipeline (`processCodeForDevice`) turns prebundled-dep paths back into bare
+ * ids and resolves package-internal paths to full `/ns/m/node_modules/…` URLs.
  */
+import type { FrameworkServerStrategy } from './framework-strategy.js';
 export interface ImportMap {
     imports: Record<string, string>;
 }
 export interface ImportMapOptions {
     /** Origin of the Vite dev server (e.g. "http://192.168.1.5:5173") */
     origin: string;
-    /** Framework flavor (vue, angular, solid, typescript) */
+    /** Framework flavor (vue, angular, solid, typescript) — framework identity. */
     flavor: string;
+    /**
+     * Active framework strategy. Its `importMapEntries(origin)` +
+     * `volatilePatterns()` hooks supply the framework-specific pieces of the
+     * import map and volatile-pattern list.
+     * Optional: when omitted, the map/patterns carry only the shared
+     * vendor/core/HTTP entries.
+     */
+    strategy?: FrameworkServerStrategy;
     /** Additional entries to add to the import map */
     extraEntries?: Record<string, string>;
 }
 /**
  * Generate an import map from the current vendor manifest.
  *
- * Vendor modules are mapped to ns-vendor:// protocol URLs, which the
- * native runtime resolves from the in-memory vendor registry (populated
- * by vendor-bootstrap.ts).
+ * Vendor package roots map to `${origin}/ns/m/node_modules/<pkg>` — served
+ * as deps-bundle shims (thin re-exports out of `__NS_DEPS_MODULES__`, the
+ * single-evaluation bundle realm), so every specifier of a package resolves
+ * to one instance. Manifest aliases collapse onto their canonical package's
+ * URL, preserving the "many specifiers, one instance" semantics.
  *
  * IMPORTANT: Vendor entries are EXACT only (no trailing-slash prefixes).
- * The vendor bundle contains only root entry points. Subpath imports like
- * solid-js/store or @nativescript/tanstack-router/solid are separate entry
- * points with different exports — they must NOT resolve to the root vendor
- * module. Instead, they fall through to the HTTP trailing-slash prefix
+ * Subpath imports like solid-js/store or @nativescript/tanstack-router/solid
+ * are separate entry points with different exports — they must NOT resolve
+ * to the package root. They fall through to the HTTP trailing-slash prefix
  * entries from discoverInstalledPackages().
  *
  * @nativescript/core is mapped to the HTTP bridge endpoint.
@@ -54,12 +65,35 @@ export declare function generateImportMap(options: ImportMapOptions): ImportMap;
  * These patterns tell the runtime to always re-fetch matching URLs
  * instead of using cached modules.
  */
-export declare function getVolatilePatterns(flavor: string): string[];
+export declare function getVolatilePatterns(strategy?: FrameworkServerStrategy): string[];
 /**
- * Serialize the import map + volatile patterns into the config object
- * that __nsConfigureRuntime() expects.
+ * The URL canonicalization vocabulary handed to the runtime via
+ * `configureLoader({ canonicalization })`. The runtime owns the *mechanism*
+ * (fragment strip, cache-buster param drop, param sort — it keys the module
+ * registry inside the engine's synchronous resolve walk); this server owns
+ * the *vocabulary*, because every name in it is a route this server defines:
+ *
+ * - `stripParams`: Vite's `import` marker and `t`/`v` cache stamps — pure
+ *   cache busters that must not create distinct module identities.
+ * - `forPathPrefixes`: the dev endpoints under which query normalization is
+ *   safe. Everything else (public/remote URLs) keeps its query verbatim,
+ *   since for general HTTP modules the query can be identity (auth,
+ *   content versioning, routing).
+ * - `preserveQueryFor`: strategy-owned paths whose query IS the module
+ *   identity (e.g. Angular's `/@ng/component?c=<id>&t=<ts>` — each `t` is a
+ *   distinct metadata recompile).
+ */
+export declare function getCanonicalization(strategy?: FrameworkServerStrategy): {
+    stripParams: string[];
+    forPathPrefixes: string[];
+    preserveQueryFor: string[];
+};
+/**
+ * Serialize the import map + volatile patterns + canonicalization vocabulary
+ * into the config object that ns:module configureLoader() expects.
  */
 export declare function buildRuntimeConfig(options: ImportMapOptions): {
     importMap: string;
     volatilePatterns: string[];
+    canonicalization: ReturnType<typeof getCanonicalization>;
 };