vike 0.4.229-commit-7056ef0 → 0.4.229-commit-5da80bf

package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.d.ts

@@ -3,18 +3,14 @@ export { getPageContextFromHooks_serialized };
 export { getPageContextFromServerHooks };
 export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
-export { executeHookClient };
+export { execHookClient };
 export type { PageContextFromServerHooks };
 import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
-import { type PageContextForUserConsumptionClientSide } from '../shared/preparePageContextForUserConsumptionClientSide.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 import type { HookName } from '../../shared/page-configs/Config.js';
-type PageContext = {
-    urlOriginal: string;
-    _urlRewrite: string | null;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
-};
+import type { PageContextCreated } from './createPageContextClientSide.js';
+import type { PageContextBegin } from './renderPageClientSide.js';
+import { type PageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
 type PageContextSerialized = {
     pageId: string;
     _hasPageContextFromServer: true;
@@ -23,17 +19,208 @@ declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
     _hasPageContextFromServer: true;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContextBegin & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
-}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
+} & PageContextForPublicUsageClient): Promise<PageContextSerialized & {
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: true;
+    isPrerendering: false;
+    urlOriginal: string;
+    _globalContext: {
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExports: unknown;
+        _pageFilesAll: PageFile[];
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        config: import("../../types/index.js").ConfigResolved;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
+    } & {
+        isClientSide: true;
+    } & {
+        _pageRoutes: import("../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    };
+    _pageFilesAll: PageFile[];
+    _pageConfigs: PageConfigRuntime[];
+    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
+    _pageRoutes: import("../../__internal/index.js").PageRoutes;
+    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _urlHandler: null;
+    _urlRewrite: null | string;
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+    isBackwardNavigation: boolean | null;
+    isClientSideNavigation: boolean;
+    isHydration: boolean;
+    previousPageContext: ({
+        pageId: string;
+    } & PageConfigUserFriendlyOld & {
+        pageId: string;
+        routeParams: Record<string, string>;
+    } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../shared/types.js").PageContextInternalClient & Omit<Partial<{
+        isPageContext: true;
+        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        routeParams: Record<string, string>;
+        data: unknown;
+        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        configEntries: import("../../types/index.js").ConfigEntries;
+        exports: Record<string, unknown>;
+        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+        urlOriginal: string;
+        headers: Record<string, string> | null;
+        headersOriginal?: unknown;
+        is404: boolean | null;
+        isClientSideNavigation: boolean;
+        abortReason?: unknown;
+        abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+        errorWhileRendering?: unknown;
+        pageId: string | null;
+        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        url: string;
+        pageExports: Record<string, unknown>;
+        isBaseMissing?: true;
+    }> & Pick<{
+        isPageContext: true;
+        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        routeParams: Record<string, string>;
+        data: unknown;
+        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        configEntries: import("../../types/index.js").ConfigEntries;
+        exports: Record<string, unknown>;
+        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+        urlOriginal: string;
+        headers: Record<string, string> | null;
+        headersOriginal?: unknown;
+        is404: boolean | null;
+        isClientSideNavigation: boolean;
+        abortReason?: unknown;
+        abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+        errorWhileRendering?: unknown;
+        pageId: string | null;
+        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        url: string;
+        pageExports: Record<string, unknown>;
+        isBaseMissing?: true;
+    }, "exports" | "pageId" | "Page" | "data" | "config" | "pageExports" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "source" | "sources" | "from"> & {
+        isClientSide: true;
+        isPrerendering: false;
+    } & {
+        isHydration: boolean;
+        isBackwardNavigation: boolean | null;
+        previousPageContext: import("../../shared/types.js").PageContextClient<unknown> | null;
+        globalContext: import("./globalContext.js").GlobalContextClient;
+    } & {
+        urlOriginal: string;
+    } & {
+        urlParsed: import("./utils.js").UrlPublic;
+        urlPathname: string;
+        url: string;
+    }, ("globalContext" | "Page" | "data") | "previousPageContext"> & {
+        previousPageContext: {
+            pageId: string;
+        } | null;
+    } & {
+        urlOriginal: string;
+    }) | null;
+} & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
+} & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
+    isPageContext: true;
+    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    routeParams: Record<string, string>;
+    data: unknown;
+    config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+    configEntries: import("../../types/index.js").ConfigEntries;
+    exports: Record<string, unknown>;
+    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+    urlOriginal: string;
+    headers: Record<string, string> | null;
+    headersOriginal?: unknown;
+    is404: boolean | null;
+    isClientSideNavigation: boolean;
+    abortReason?: unknown;
+    abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+    errorWhileRendering?: unknown;
+    pageId: string | null;
+    from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+    source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+    sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+    url: string;
+    pageExports: Record<string, unknown>;
+    isBaseMissing?: true;
+}> & Pick<{
+    isPageContext: true;
+    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    routeParams: Record<string, string>;
+    data: unknown;
+    config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+    configEntries: import("../../types/index.js").ConfigEntries;
+    exports: Record<string, unknown>;
+    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+    urlOriginal: string;
+    headers: Record<string, string> | null;
+    headersOriginal?: unknown;
+    is404: boolean | null;
+    isClientSideNavigation: boolean;
+    abortReason?: unknown;
+    abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+    errorWhileRendering?: unknown;
+    pageId: string | null;
+    from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+    source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+    sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+    url: string;
+    pageExports: Record<string, unknown>;
+    isBaseMissing?: true;
+}, "exports" | "pageId" | "Page" | "data" | "config" | "pageExports" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "source" | "sources" | "from"> & {
+    isClientSide: true;
+    isPrerendering: false;
+} & {
+    isHydration: boolean;
+    isBackwardNavigation: boolean | null;
+    previousPageContext: import("../../shared/types.js").PageContextClient<unknown> | null;
+    globalContext: import("./globalContext.js").GlobalContextClient;
+} & {
+    urlOriginal: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+}, ("globalContext" | "Page" | "data") | "previousPageContext"> & {
+    previousPageContext: {
+        pageId: string;
+    } | null;
+} & {
+    urlOriginal: string;
 }>;
 type PageContextFromServerHooks = {
     _hasPageContextFromServer: boolean;
 };
 declare function getPageContextFromServerHooks(pageContext: {
     pageId: string;
-} & PageContext, isErrorPage: boolean): Promise<{
+} & PageContextCreated, isErrorPage: boolean): Promise<{
     is404ServerSideRouted: true;
 } | {
     is404ServerSideRouted?: undefined;
@@ -42,16 +229,206 @@ declare function getPageContextFromServerHooks(pageContext: {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContext & PageConfigUserFriendlyOld, isErrorPage: boolean): Promise<{
+} & PageContextBegin & PageConfigUserFriendlyOld & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<{
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContext & PageConfigUserFriendlyOld>;
-type PageContextExecuteHookClient = PageConfigUserFriendlyOld & PageContextForUserConsumptionClientSide;
-declare function executeHookClient(hookName: HookName, pageContext: PageContextExecuteHookClient): Promise<{
-    hookResult: unknown;
-    hookName: import("../../shared/page-configs/Config.js").HookNameOld;
-    hookFilePath: string;
-    hookFn: (arg: object) => unknown;
+} & {
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: true;
+    isPrerendering: false;
+    urlOriginal: string;
+    _globalContext: {
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExports: unknown;
+        _pageFilesAll: PageFile[];
+        _pageConfigs: PageConfigRuntime[];
+        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        config: import("../../types/index.js").ConfigResolved;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
+    } & {
+        isClientSide: true;
+    } & {
+        _pageRoutes: import("../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    };
+    _pageFilesAll: PageFile[];
+    _pageConfigs: PageConfigRuntime[];
+    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
+    _pageRoutes: import("../../__internal/index.js").PageRoutes;
+    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+    _urlHandler: null;
+    _urlRewrite: null | string;
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+    isBackwardNavigation: boolean | null;
+    isClientSideNavigation: boolean;
+    isHydration: boolean;
+    previousPageContext: ({
+        pageId: string;
+    } & PageConfigUserFriendlyOld & {
+        pageId: string;
+        routeParams: Record<string, string>;
+    } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../shared/types.js").PageContextInternalClient & Omit<Partial<{
+        isPageContext: true;
+        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        routeParams: Record<string, string>;
+        data: unknown;
+        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        configEntries: import("../../types/index.js").ConfigEntries;
+        exports: Record<string, unknown>;
+        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+        urlOriginal: string;
+        headers: Record<string, string> | null;
+        headersOriginal?: unknown;
+        is404: boolean | null;
+        isClientSideNavigation: boolean;
+        abortReason?: unknown;
+        abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+        errorWhileRendering?: unknown;
+        pageId: string | null;
+        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        url: string;
+        pageExports: Record<string, unknown>;
+        isBaseMissing?: true;
+    }> & Pick<{
+        isPageContext: true;
+        Page: import("../../shared/page-configs/Config.js").Config["Page"];
+        routeParams: Record<string, string>;
+        data: unknown;
+        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        configEntries: import("../../types/index.js").ConfigEntries;
+        exports: Record<string, unknown>;
+        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+        urlOriginal: string;
+        headers: Record<string, string> | null;
+        headersOriginal?: unknown;
+        is404: boolean | null;
+        isClientSideNavigation: boolean;
+        abortReason?: unknown;
+        abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+        errorWhileRendering?: unknown;
+        pageId: string | null;
+        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        url: string;
+        pageExports: Record<string, unknown>;
+        isBaseMissing?: true;
+    }, "exports" | "pageId" | "Page" | "data" | "config" | "pageExports" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "source" | "sources" | "from"> & {
+        isClientSide: true;
+        isPrerendering: false;
+    } & {
+        isHydration: boolean;
+        isBackwardNavigation: boolean | null;
+        previousPageContext: import("../../shared/types.js").PageContextClient<unknown> | null;
+        globalContext: import("./globalContext.js").GlobalContextClient;
+    } & {
+        urlOriginal: string;
+    } & {
+        urlParsed: import("./utils.js").UrlPublic;
+        urlPathname: string;
+        url: string;
+    }, ("globalContext" | "Page" | "data") | "previousPageContext"> & {
+        previousPageContext: {
+            pageId: string;
+        } | null;
+    } & {
+        urlOriginal: string;
+    }) | null;
+} & PageConfigUserFriendlyOld & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
+    isPageContext: true;
+    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    routeParams: Record<string, string>;
+    data: unknown;
+    config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+    configEntries: import("../../types/index.js").ConfigEntries;
+    exports: Record<string, unknown>;
+    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+    urlOriginal: string;
+    headers: Record<string, string> | null;
+    headersOriginal?: unknown;
+    is404: boolean | null;
+    isClientSideNavigation: boolean;
+    abortReason?: unknown;
+    abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+    errorWhileRendering?: unknown;
+    pageId: string | null;
+    from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+    source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+    sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+    url: string;
+    pageExports: Record<string, unknown>;
+    isBaseMissing?: true;
+}> & Pick<{
+    isPageContext: true;
+    Page: import("../../shared/page-configs/Config.js").Config["Page"];
+    routeParams: Record<string, string>;
+    data: unknown;
+    config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+    configEntries: import("../../types/index.js").ConfigEntries;
+    exports: Record<string, unknown>;
+    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
+    urlOriginal: string;
+    headers: Record<string, string> | null;
+    headersOriginal?: unknown;
+    is404: boolean | null;
+    isClientSideNavigation: boolean;
+    abortReason?: unknown;
+    abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
+    errorWhileRendering?: unknown;
+    pageId: string | null;
+    from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
+    source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
+    sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+    url: string;
+    pageExports: Record<string, unknown>;
+    isBaseMissing?: true;
+}, "exports" | "pageId" | "Page" | "data" | "config" | "pageExports" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "source" | "sources" | "from"> & {
+    isClientSide: true;
+    isPrerendering: false;
+} & {
+    isHydration: boolean;
+    isBackwardNavigation: boolean | null;
+    previousPageContext: import("../../shared/types.js").PageContextClient<unknown> | null;
+    globalContext: import("./globalContext.js").GlobalContextClient;
+} & {
+    urlOriginal: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+}, ("globalContext" | "Page" | "data") | "previousPageContext"> & {
+    previousPageContext: {
+        pageId: string;
+    } | null;
+} & {
+    urlOriginal: string;
+}>;
+type PageContextExecuteHookClient = PageConfigUserFriendlyOld & PageContextForPublicUsageClient;
+declare function execHookClient(hookName: HookName, pageContext: PageContextExecuteHookClient): Promise<(import("../../shared/hooks/getHook.js").HookLoc & {
+    hookFn: (arg: import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum | import("../../shared/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum) => unknown;
     hookTimeout: import("../../shared/hooks/getHook.js").HookTimeout;
-}[]>;
+} & {
+    hookReturn: unknown;
+})[]>;
 declare function setPageContextInitIsPassedToClient(pageContext: Record<string, unknown>): void;

package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js

@@ -3,12 +3,11 @@ export { getPageContextFromHooks_serialized };
 export { getPageContextFromServerHooks };
 export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
-export { executeHookClient };
+export { execHookClient };
 import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject } from './utils.js';
 import { parse } from '@brillout/json-serializer/parse';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { analyzePageServerSide } from '../../shared/getPageFiles/analyzePageServerSide.js';
-import { preparePageContextForUserConsumptionClientSide } from '../shared/preparePageContextForUserConsumptionClientSide.js';
 import { removeBuiltInOverrides } from './getPageContext/removeBuiltInOverrides.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getPageConfig } from '../../shared/page-configs/helpers.js';
@@ -18,7 +17,8 @@ import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
 import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
 import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
 import { isServerSideError } from '../../shared/misc/isServerSideError.js';
-import { executeHookNew } from '../../shared/hooks/executeHook.js';
+import { execHook } from '../../shared/hooks/execHook.js';
+import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
 const globalObject = getGlobalObject('client-routing-runtime/getPageContextFromHooks.ts', {});
 // TO-DO/eventually: rename
 function getPageContextFromHooks_serialized() {
@@ -78,7 +78,7 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
                 !pageContext._hasPageContextFromServer) {
                 // Should we really call the guard() hook on the client-side? Shouldn't we make the guard() hook a server-side
                 // only hook? Or maybe make its env configurable like data() and onBeforeRender()?
-                await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionClientSide(pageContext, true));
+                await executeGuardHook(pageContext, (pageContext) => preparePageContextForPublicUsageClient(pageContext));
             }
         }
         else {
@@ -92,13 +92,13 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
     }
     // Execute +onData
     if (dataHookExists) {
-        await executeHookClient('onData', pageContext);
+        await execHookClient('onData', pageContext);
     }
     const pageContextFromClientHooks = pageContext;
     return pageContextFromClientHooks;
 }
-async function executeHookClient(hookName, pageContext) {
-    return await executeHookNew(hookName, pageContext, (p) => preparePageContextForUserConsumptionClientSide(p, true));
+async function execHookClient(hookName, pageContext) {
+    return await execHook(hookName, pageContext, (p) => preparePageContextForPublicUsageClient(p));
 }
 async function executeDataLikeHook(hookName, pageContext) {
     let pageContextFromHook;
@@ -111,24 +111,24 @@ async function executeDataLikeHook(hookName, pageContext) {
     Object.assign(pageContext, pageContextFromHook);
 }
 async function executeDataHook(pageContext) {
-    const res = await executeHookClient('data', pageContext);
+    const res = await execHookClient('data', pageContext);
     const hook = res[0]; // TO-DO/soon: support cumulative
     if (!hook)
         return;
-    const { hookResult } = hook;
-    const pageContextAddendum = { data: hookResult };
+    const { hookReturn } = hook;
+    const pageContextAddendum = { data: hookReturn };
     return pageContextAddendum;
 }
 async function executeOnBeforeRenderHook(pageContext) {
-    const res = await executeHookClient('onBeforeRender', pageContext);
+    const res = await execHookClient('onBeforeRender', pageContext);
     const hook = res[0]; // TO-DO/soon: support cumulative
     if (!hook)
         return;
-    const { hookResult, hookFilePath } = hook;
+    const { hookReturn, hookFilePath } = hook;
     const pageContextFromHook = {};
-    assertOnBeforeRenderHookReturn(hookResult, hookFilePath);
-    // Note: hookResult looks like { pageContext: { ... } }
-    const pageContextFromOnBeforeRender = hookResult?.pageContext;
+    assertOnBeforeRenderHookReturn(hookReturn, hookFilePath);
+    // Note: hookReturn looks like { pageContext: { ... } }
+    const pageContextFromOnBeforeRender = hookReturn?.pageContext;
     if (pageContextFromOnBeforeRender) {
         objectAssign(pageContextFromHook, pageContextFromOnBeforeRender);
     }

package/dist/esm/client/client-routing-runtime/globalContext.d.ts

@@ -5,6 +5,7 @@ type GlobalContextClient = GlobalContextSharedPublic & Pick<GlobalContextClientI
 type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare const getGlobalContextClientInternal: () => Promise<{
     isGlobalContext: true;
+    _isOriginalObject: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];

package/dist/esm/client/client-routing-runtime/prefetch.d.ts

@@ -5,17 +5,12 @@ export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
+import { type PageContextCreated } from './createPageContextClientSide.js';
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
-import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
-type PageContextForPrefetch = {
-    urlOriginal: string;
-    urlPathname: string;
+type PageContextForPrefetch = PageContextCreated & {
     pageId: string;
-    _urlRewrite: null;
-    _pageFilesAll: PageFile[];
-    _pageConfigs: PageConfigRuntime[];
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;

package/dist/esm/client/client-routing-runtime/preparePageContextForPublicUsageClient.d.ts

@@ -0,0 +1,11 @@
+export { preparePageContextForPublicUsageClient };
+export type { PageContextForPublicUsageClient };
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+import type { PageContextInternalClient_ClientRouting } from '../../shared/types.js';
+import type { PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
+type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ClientRouting & PageConfigUserFriendlyOld & {
+    urlOriginal: string;
+};
+declare function preparePageContextForPublicUsageClient<PageContext extends PageContextForPublicUsageClient>(pageContext: PageContext): PageContext & {
+    Page: unknown;
+};

package/dist/esm/client/client-routing-runtime/preparePageContextForPublicUsageClient.js

@@ -0,0 +1,5 @@
+export { preparePageContextForPublicUsageClient };
+import { preparePageContextForPublicUsageClientShared } from '../shared/preparePageContextForPublicUsageClientShared.js';
+function preparePageContextForPublicUsageClient(pageContext) {
+    return preparePageContextForPublicUsageClientShared(pageContext);
+}