vike 0.4.229-commit-7056ef0 → 0.4.229-commit-e27d672

package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts

@@ -1,10 +1,10 @@
 export { createPageContextServerSide };
 export { createPageContextServerSideWithoutGlobalContext };
-export type { PageContextCreatedServerSide };
-import type { GlobalContextServerInternal, GlobalContextServer } from '../globalContext.js';
+export type { PageContextCreated };
+import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { PageContextInit } from '../renderPage.js';
-type PageContextCreatedServerSide = Awaited<ReturnType<typeof createPageContextServerSide>>;
-declare function createPageContextServerSide(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, globalObject_public: GlobalContextServer, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } }: {
+type PageContextCreated = Awaited<ReturnType<typeof createPageContextServerSide>>;
+declare function createPageContextServerSide(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } }: {
     isPrerendering: false;
     ssr: {
         urlHandler: null | ((url: string) => string);
@@ -14,15 +14,18 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     isPrerendering: true;
     ssr?: undefined;
 }): Promise<{
-    isClientSide: boolean;
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: false;
     isPrerendering: boolean;
-} & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+} & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 } & {
-    globalContext: GlobalContextServer;
     _globalContext: {
         isGlobalContext: true;
+        _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../../__internal/index.js").PageConfig[];
@@ -60,23 +63,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        _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;
-            });
-        };
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -99,23 +85,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        _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;
-            });
-        };
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -138,23 +107,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         isClientSide: false;
         _pageRoutes: import("../../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        _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;
-            });
-        };
     });
     _baseServer: string;
     _baseAssets: string;
@@ -175,13 +127,14 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     url: string;
 } & {
     headers: Record<string, string> | null;
-} & {
-    isPageContext: true;
 }>;
 declare function createPageContextServerSideWithoutGlobalContext(pageContextInit: PageContextInit): {
-    isClientSide: boolean;
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: false;
     isPrerendering: boolean;
-} & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+} & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     url?: string;
     headers?: Record<string, string>;
 };

package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js

@@ -2,19 +2,14 @@ export { createPageContextServerSide };
 export { createPageContextServerSideWithoutGlobalContext };
 import { assert, assertUsage, assertWarning, augmentType, normalizeHeaders, objectAssign } from '../utils.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
-import { createPageContextShared } from '../../../shared/createPageContextShared.js';
-async function createPageContextServerSide(pageContextInit, globalContext, globalObject_public, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
+import { createPageContextObject, createPageContextShared } from '../../../shared/createPageContextShared.js';
+async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
     urlHandler: null,
     isClientSideNavigation: false
 } }) {
     assert(pageContextInit.urlOriginal);
     const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
     objectAssign(pageContextCreated, {
-        /* Don't spread globalContext for now? Or never spread it as it leads to confusion? The convenience isn't worth the added confusion?
-        // We must use Flatten<T> otherwise TypeScript complains upon assigning types
-        ...(globalContext as Flatten<typeof globalContext>), // least precedence
-        */
-        globalContext: globalObject_public,
         _globalContext: globalContext,
         // The following is defined on `pageContext` because we can eventually make these non-global
         _baseServer: globalContext.baseServer,
@@ -63,10 +58,11 @@ function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
     return pageContext;
 }
 function createPageContext(pageContextInit, isPrerendering) {
-    const pageContext = {
+    const pageContext = createPageContextObject();
+    objectAssign(pageContext, {
         isClientSide: false,
         isPrerendering
-    };
+    });
     objectAssign(pageContext, pageContextInit);
     return pageContext;
 }

package/dist/esm/node/runtime/renderPage/execHookServer.d.ts

@@ -0,0 +1,12 @@
+export { execHookServer };
+export type { PageContextExecuteHookServer };
+import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
+import type { HookName } from '../../../shared/page-configs/Config.js';
+type PageContextExecuteHookServer = PageConfigUserFriendlyOld & PageContextForPublicUsageServer;
+declare function execHookServer(hookName: HookName, pageContext: PageContextExecuteHookServer): 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;
+})[]>;

package/dist/esm/node/runtime/renderPage/execHookServer.js

@@ -0,0 +1,9 @@
+export { execHookServer };
+import { execHook } from '../../../shared/hooks/execHook.js';
+import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+async function execHookServer(hookName, pageContext) {
+    return await execHook(hookName, pageContext, (p) => {
+        preparePageContextForPublicUsageServer(p);
+        return p;
+    });
+}

package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.d.ts

@@ -1,5 +1,5 @@
 export { executeOnBeforeRenderAndDataHooks };
-import { type PageContextExecuteHookServer } from './executeHookServer.js';
+import { type PageContextExecuteHookServer } from './execHookServer.js';
 declare function executeOnBeforeRenderAndDataHooks(pageContext: {
     pageId: string;
     _pageContextAlreadyProvidedByOnPrerenderHook?: true;

package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js

@@ -1,29 +1,29 @@
 export { executeOnBeforeRenderAndDataHooks };
 import { assertOnBeforeRenderHookReturn } from '../../../shared/assertOnBeforeRenderHookReturn.js';
-import { executeHookServer } from './executeHookServer.js';
+import { execHookServer } from './execHookServer.js';
 async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;
     }
-    const hooks = await executeHookServer('data', pageContext);
+    const hooks = await execHookServer('data', pageContext);
     const dataHook = hooks[0]; // TO-DO/soon: support cumulative
     if (dataHook) {
-        // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
+        // Note: hookReturn can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
-            data: dataHook.hookResult
+            data: dataHook.hookReturn
         };
         Object.assign(pageContext, pageContextFromHook);
         // Execute +onData
         if (!pageContext.isClientSideNavigation) {
-            await executeHookServer('onData', pageContext);
+            await execHookServer('onData', pageContext);
         }
     }
-    const res = await executeHookServer('onBeforeRender', pageContext);
+    const res = await execHookServer('onBeforeRender', pageContext);
     const onBeforeRenderHook = res[0]; // TO-DO/soon: support cumulative
     if (onBeforeRenderHook) {
-        const { hookResult } = onBeforeRenderHook;
-        assertOnBeforeRenderHookReturn(hookResult, onBeforeRenderHook.hookFilePath);
-        const pageContextFromHook = hookResult?.pageContext;
+        const { hookReturn } = onBeforeRenderHook;
+        assertOnBeforeRenderHookReturn(hookReturn, onBeforeRenderHook.hookFilePath);
+        const pageContextFromHook = hookReturn?.pageContext;
         Object.assign(pageContext, pageContextFromHook);
     }
 }

package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.d.ts

@@ -3,16 +3,18 @@ export type { RenderHook };
 import { type HtmlRender } from '../html/renderHtml.js';
 import { type Hook } from '../../../shared/hooks/getHook.js';
 import type { PageAsset } from './getPageAssets.js';
-import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextSerialization } from '../html/serializeContext.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
 type RenderHook = Hook & {
     hookName: HookName;
 };
 type HookName = 'onRenderHtml' | 'render';
-declare function executeOnRenderHtmlHook(pageContext: PageContextForUserConsumptionServerSide & PageContextSerialization & {
+declare function executeOnRenderHtmlHook(pageContext: PageContextForPublicUsageServer & PageContextSerialization & {
     pageId: string;
+    _globalContext: GlobalContextServerInternal;
     _pageConfigs: PageConfigRuntime[];
     __getPageAssets: GetPageAssets;
     _isHtmlOnly: boolean;

package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.js

@@ -4,17 +4,16 @@ import { getHookFromPageContext } from '../../../shared/hooks/getHook.js';
 import { assert, assertUsage, assertWarning, isObject, objectAssign, isPromise, isCallable } from '../utils.js';
 import { isStream } from '../html/stream.js';
 import { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.js';
-import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
 import { assertHookReturnedObject } from '../../../shared/assertHookReturnedObject.js';
 import { logRuntimeError } from './loggerRuntime.js';
 import pc from '@brillout/picocolors';
-import { executeHook } from '../../../shared/hooks/executeHook.js';
+import { execHookSingleWithReturn } from '../../../shared/hooks/execHook.js';
 async function executeOnRenderHtmlHook(pageContext) {
-    const { renderHook, hookFn } = getRenderHook(pageContext);
-    objectAssign(pageContext, { _renderHook: renderHook });
-    preparePageContextForUserConsumptionServerSide(pageContext);
-    const hookReturnValue = await executeHook(() => hookFn(pageContext), renderHook, pageContext);
-    const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
+    const hook = getRenderHook(pageContext);
+    objectAssign(pageContext, { _renderHook: hook });
+    const { hookReturn } = await execHookSingleWithReturn(hook, pageContext, preparePageContextForPublicUsageServer);
+    const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturn, hook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     objectAssign(pageContext, { _pageContextPromise: pageContextPromise });
     const onErrorWhileStreaming = (err) => {
@@ -29,7 +28,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     };
     const htmlRender = await renderDocumentHtml(documentHtml, pageContext, onErrorWhileStreaming, injectFilter);
     assert(typeof htmlRender === 'string' || isStream(htmlRender));
-    return { htmlRender, renderHook };
+    return { htmlRender, renderHook: hook };
 }
 function getRenderHook(pageContext) {
     let hookFound;
@@ -49,10 +48,7 @@ function getRenderHook(pageContext) {
         if (hook) {
             assert(hookName);
             const { hookFilePath, hookFn, hookTimeout } = hook;
-            hookFound = {
-                hookFn,
-                renderHook: { hookFn, hookFilePath, hookName, hookTimeout }
-            };
+            hookFound = { hookFn, hookFilePath, hookName, hookTimeout };
         }
     }
     if (!hookFound) {

package/dist/esm/node/runtime/renderPage/preparePageContextForPublicUsageServer.d.ts

@@ -0,0 +1,20 @@
+export { preparePageContextForPublicUsageServer };
+export type { PageContextForPublicUsageServer };
+import type { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getUserFriendlyConfigs.js';
+import type { PageContextInternalServer } from '../../../shared/types.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
+type PageContextForPublicUsageServer = PageContextInternalServer & PageConfigUserFriendlyOld & {
+    urlOriginal: string;
+    /** @deprecated */
+    url: string;
+    urlPathname: string;
+    urlParsed: PageContextUrlInternal['urlParsed'];
+    routeParams: Record<string, string>;
+    Page: unknown;
+    pageId: string;
+    is404: null | boolean;
+    isClientSideNavigation: boolean;
+    _globalContext: GlobalContextServerInternal;
+};
+declare function preparePageContextForPublicUsageServer<PageContext extends PageContextForPublicUsageServer>(pageContext: PageContext): PageContext;

package/dist/esm/node/runtime/renderPage/preparePageContextForPublicUsageServer.js

@@ -0,0 +1,8 @@
+export { preparePageContextForPublicUsageServer };
+import { assertPropertyGetters, preparePageContextForPublicUsage } from '../../../shared/preparePageContextForPublicUsage.js';
+function preparePageContextForPublicUsageServer(pageContext) {
+    // TODO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
+    assertPropertyGetters(pageContext);
+    pageContext = preparePageContextForPublicUsage(pageContext);
+    return pageContext;
+}

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -4,7 +4,7 @@ export type { PageContextAfterRender };
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { PageContext_loadPageConfigsLazyServerSide, type PageFiles } from './loadPageConfigsLazyServerSide.js';
-import type { PageContextCreatedServerSide } from './createPageContextServerSide.js';
+import type { PageContextCreated } from './createPageContextServerSide.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
     errorWhileRendering: null | Error;
@@ -16,8 +16,8 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextCreatedServerSide & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
-declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageFiles & {
+} & PageContextCreated & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+declare function prerenderPage(pageContext: PageContextCreated & PageFiles & {
     routeParams: Record<string, string>;
     pageId: string;
     _urlRewrite: null;
@@ -29,15 +29,18 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
-        isClientSide: boolean;
+        _isOriginalObject: true;
+        isPageContext: true;
+    } & {
+        isClientSide: false;
         isPrerendering: boolean;
-    } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+    } & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
         url?: string;
         headers?: Record<string, string>;
     } & {
-        globalContext: import("../globalContext.js").GlobalContextServer;
         _globalContext: {
             isGlobalContext: true;
+            _isOriginalObject: true;
             _virtualFileExports: unknown;
             _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
@@ -75,23 +78,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _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;
-                });
-            };
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -114,23 +100,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _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;
-                });
-            };
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -153,23 +122,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _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;
-                });
-            };
         });
         _baseServer: string;
         _baseAssets: string;
@@ -190,8 +142,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & {
-        isPageContext: true;
     } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
@@ -215,15 +165,18 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
-        isClientSide: boolean;
+        _isOriginalObject: true;
+        isPageContext: true;
+    } & {
+        isClientSide: false;
         isPrerendering: boolean;
-    } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+    } & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
         url?: string;
         headers?: Record<string, string>;
     } & {
-        globalContext: import("../globalContext.js").GlobalContextServer;
         _globalContext: {
             isGlobalContext: true;
+            _isOriginalObject: true;
             _virtualFileExports: unknown;
             _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
@@ -261,23 +214,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _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;
-                });
-            };
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -300,23 +236,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _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;
-                });
-            };
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -339,23 +258,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _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;
-                });
-            };
         });
         _baseServer: string;
         _baseAssets: string;
@@ -376,8 +278,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & {
-        isPageContext: true;
     } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -10,7 +10,7 @@ import { executeOnRenderHtmlHook } from './executeOnRenderHtmlHook.js';
 import { executeOnBeforeRenderAndDataHooks } from './executeOnBeforeRenderAndDataHooks.js';
 import { logRuntimeError } from './loggerRuntime.js';
 import { isNewError } from './isNewError.js';
-import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
 import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
@@ -23,7 +23,7 @@ async function renderPageAlreadyRouted(pageContext) {
     assert(isError === (pageContext.pageId === getErrorPageId(pageContext._pageFilesAll, pageContext._pageConfigs)));
     objectAssign(pageContext, await loadPageConfigsLazyServerSide(pageContext));
     if (!isError) {
-        await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionServerSide(pageContext));
+        await executeGuardHook(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext));
     }
     if (!isError) {
         await executeOnBeforeRenderAndDataHooks(pageContext);
@@ -60,7 +60,7 @@ async function prerenderPage(pageContext) {
     });
     /* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
-    await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionServerSide(pageContext))
+    await executeGuardHook(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext))
     */
     await executeOnBeforeRenderAndDataHooks(pageContext);
     const { htmlRender, renderHook } = await executeOnRenderHtmlHook(pageContext);