vike 0.4.250 → 0.4.251-commit-9c5fb90

package/dist/server/runtime/renderPageServer/html/injectAssets.js

@@ -1,6 +1,9 @@
+import '../../../assertEnvServer.js';
 export { injectHtmlTagsToString };
 export { injectHtmlTagsToStream };
-import { assert, isCallable, isPromise } from '../../../utils.js';
+import { isPromise } from '../../../../utils/isPromise.js';
+import { isCallable } from '../../../../utils/isCallable.js';
+import { assert } from '../../../../utils/assert.js';
 import { assertPageContextProvidedByUser } from '../../../../shared-server-client/assertPageContextProvidedByUser.js';
 import { joinHtmlTags, injectHtmlTags, createHtmlHeadIfMissing, injectHtmlTagsUsingStream, } from './injectAssets/injectHtmlTags.js';
 import { getHtmlTags } from './injectAssets/getHtmlTags.js';

package/dist/server/runtime/renderPageServer/html/propKeys.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { getPropVal };
 export { setPropVal };
 export { getPropKeys };

package/dist/server/runtime/renderPageServer/html/propKeys.js

@@ -1,7 +1,8 @@
+import '../../../assertEnvServer.js';
 export { getPropVal };
 export { setPropVal };
 export { getPropKeys };
-import { isObject } from '../../../utils.js';
+import { isObject } from '../../../../utils/isObject.js';
 // Get a nested property from an object using a dot-separated path such as 'user.id'
 function getPropVal(obj, prop) {
     const keys = getPropKeys(prop);

package/dist/server/runtime/renderPageServer/html/renderHtml.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { escapeInject };
 export { dangerouslySkipEscape };
 export { renderDocumentHtml };

package/dist/server/runtime/renderPageServer/html/renderHtml.js

@@ -1,9 +1,16 @@
+import '../../../assertEnvServer.js';
 export { escapeInject };
 export { dangerouslySkipEscape };
 export { renderDocumentHtml };
 export { isDocumentHtml };
 export { getHtmlString };
-import { assert, assertUsage, assertWarning, checkType, escapeHtml, hasProp, isHtml, isPromise, objectAssign, } from '../../../utils.js';
+import { escapeHtml } from '../../../../utils/escapeHtml.js';
+import { isPromise } from '../../../../utils/isPromise.js';
+import { isHtml } from '../../../../utils/isHtml.js';
+import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { checkType } from '../../../../utils/checkType.js';
+import { hasProp } from '../../../../utils/hasProp.js';
+import { objectAssign } from '../../../../utils/objectAssign.js';
 import { injectHtmlTagsToString, injectHtmlTagsToStream } from './injectAssets.js';
 import { processStream, isStream, streamToString, } from './stream.js';
 import { isStreamFromReactStreamingPackage } from './stream/react-streaming.js';

package/dist/server/runtime/renderPageServer/html/serializeContext.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
@@ -6,10 +7,10 @@ export type { PassToClient };
 export type { PassToClientPublic };
 import type { UrlRedirect } from '../../../../shared-server-client/route/abort.js';
 import type { GlobalContextServerInternal } from '../../globalContext.js';
-import type { PageContextCreated } from '../createPageContextServerSide.js';
+import type { PageContextCreatedServer } from '../createPageContextServer.js';
 import type { PageContextBegin } from '../../renderPageServer.js';
 import type { PageContextCspNonce } from '../csp.js';
-type PageContextSerialization = PageContextCreated & {
+type PageContextSerialization = PageContextCreatedServer & {
     pageId: string;
     routeParams: Record<string, string>;
     _passToClient: PassToClient;

package/dist/server/runtime/renderPageServer/html/serializeContext.js

@@ -1,8 +1,12 @@
+import '../../../assertEnvServer.js';
 export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
 import { stringify, isJsonSerializerError } from '@brillout/json-serializer/stringify';
-import { assert, assertUsage, assertWarning, getPropAccessNotation, hasProp, unique } from '../../../utils.js';
+import { unique } from '../../../../utils/unique.js';
+import { getPropAccessNotation } from '../../../../utils/getPropAccessNotation.js';
+import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { hasProp } from '../../../../utils/hasProp.js';
 import { isErrorPage } from '../../../../shared-server-client/error-page.js';
 import { addIs404ToPageProps } from '../../../../shared-server-client/addIs404ToPageProps.js';
 import pc from '@brillout/picocolors';

package/dist/server/runtime/renderPageServer/html/stream/react-streaming.d.ts

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { isStreamFromReactStreamingPackage };
 export { streamFromReactStreamingPackageToString };
 export { getStreamOfReactStreamingPackage };

package/dist/server/runtime/renderPageServer/html/stream/react-streaming.js

@@ -1,8 +1,11 @@
+import '../../../../assertEnvServer.js';
 // Zero-config support for https://www.npmjs.com/package/react-streaming
 export { isStreamFromReactStreamingPackage };
 export { streamFromReactStreamingPackageToString };
 export { getStreamOfReactStreamingPackage };
-import { assert, assertUsage, hasProp, isVikeReactApp } from '../../../../utils.js';
+import { assert, assertUsage } from '../../../../../utils/assert.js';
+import { hasProp } from '../../../../../utils/hasProp.js';
+import { isVikeReactApp } from '../../../../../utils/isVikeReactApp.js';
 import { streamPipeNodeToString, streamReadableWebToString } from '../stream.js';
 function streamFromReactStreamingPackageToString(stream) {
     if (stream.pipe) {

package/dist/server/runtime/renderPageServer/html/stream.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { processStream };
 export { streamToString };
 export { stampPipe };

package/dist/server/runtime/renderPageServer/html/stream.js

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { processStream };
 export { streamToString };
 export { stampPipe };
@@ -19,7 +20,14 @@ export { streamReadableWebToString };
 export { streamPipeNodeToString };
 export { isStreamWritableWeb };
 export { isStreamWritableNode };
-import { assert, assertUsage, checkType, isObject, hasProp, objectAssign, capitalizeFirstLetter, assertWarning, isCallable, createDebug, isVikeBug, } from '../../../utils.js';
+import { isCallable } from '../../../../utils/isCallable.js';
+import { capitalizeFirstLetter } from '../../../../utils/capitalizeFirstLetter.js';
+import { createDebug } from '../../../../utils/debug.js';
+import { assert, assertUsage, assertWarning, isVikeBug } from '../../../../utils/assert.js';
+import { checkType } from '../../../../utils/checkType.js';
+import { hasProp } from '../../../../utils/hasProp.js';
+import { isObject } from '../../../../utils/isObject.js';
+import { objectAssign } from '../../../../utils/objectAssign.js';
 import { getStreamOfReactStreamingPackage, isStreamFromReactStreamingPackage, streamFromReactStreamingPackageToString, } from './stream/react-streaming.js';
 import { import_ } from '@brillout/import';
 import pc from '@brillout/picocolors';

package/dist/server/runtime/renderPageServer/inferMediaType.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { inferMediaType };
 export type { MediaType };
 type MediaType = null | {

package/dist/server/runtime/renderPageServer/inferMediaType.js

@@ -1,5 +1,7 @@
+import '../../assertEnvServer.js';
 export { inferMediaType };
-import { styleFileRE, isScriptFile } from '../../utils.js';
+import { styleFileRE } from '../../../utils/styleFileRE.js';
+import { isScriptFile } from '../../../utils/isScriptFile.js';
 function inferMediaType(href) {
     // Basics
     if (styleFileRE.test(href)) {

package/dist/server/runtime/renderPageServer/isFontFallback.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { isFontFallback };
 import type { PageAsset } from './getPageAssets.js';
 declare function isFontFallback(asset: PageAsset, pageAssets: PageAsset[]): boolean;

package/dist/server/runtime/renderPageServer/isFontFallback.js

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { isFontFallback };
 import { assert } from '../../../utils/assert.js';
 function isFontFallback(asset, pageAssets) {

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts

@@ -1,15 +1,16 @@
+import '../../assertEnvServer.js';
 export { loadPageConfigsLazyServerSide };
 export type { PageContext_loadPageConfigsLazyServerSide };
 export type { PageConfigsLazy };
 export type { PageContextAfterPageEntryLoaded };
 import { type PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
-import { PromiseType } from '../../utils.js';
+import { PromiseType } from '../../../utils/PromiseType.js';
 import { type PageAsset } from './getPageAssets.js';
 import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import type { PassToClient } from './html/serializeContext.js';
 import type { PageContextAfterRoute } from '../../../shared-server-client/route/index.js';
-import type { PageContextCreated } from './createPageContextServerSide.js';
-type PageContext_loadPageConfigsLazyServerSide = PageContextCreated & PageContextAfterRoute & {
+import type { PageContextCreatedServer } from './createPageContextServer.js';
+type PageContext_loadPageConfigsLazyServerSide = PageContextCreatedServer & PageContextAfterRoute & {
     is404: boolean | null;
     pageId: string;
 };
@@ -21,10 +22,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     isClientSide: false;
     isPrerendering: boolean;
     _requestId: number;
-} & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-    url?: string;
-    headers?: Record<string, string>;
-} & {
+} & import("../renderPageServer.js").PageContextInit & {
     _globalContext: ({
         _globalConfigPublic: {
             pages: {
@@ -142,7 +140,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
 } & {
-    urlParsed: import("../../utils.js").UrlPublic;
+    urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.js

@@ -1,8 +1,14 @@
+import '../../assertEnvServer.js';
 export { loadPageConfigsLazyServerSide };
 import { getPageFilesServerSide } from '../../../shared-server-client/getPageFiles.js';
 import { resolvePageContextConfig } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { analyzePageClientSideInit } from '../../../shared-server-client/getPageFiles/analyzePageClientSide.js';
-import { assertUsage, assertWarning, hasProp, isArray, isObject, objectAssign, updateType, } from '../../utils.js';
+import { isArray } from '../../../utils/isArray.js';
+import { assertUsage, assertWarning } from '../../../utils/assert.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isObject } from '../../../utils/isObject.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { updateType } from '../../../utils/updateType.js';
 import { getPageAssets } from './getPageAssets.js';
 import { findPageConfig } from '../../../shared-server-client/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';

package/dist/server/runtime/renderPageServer/log404/index.d.ts

@@ -1,9 +1,10 @@
+import '../../../assertEnvServer.js';
 export { log404 };
 export { getRoutesInfo };
 import type { PageRoutes } from '../../../../shared-server-client/route/index.js';
 import type { GlobalContextServerInternal } from '../../globalContext.js';
-import type { PageContextCreated } from '../createPageContextServerSide.js';
-declare function log404(pageContext: PageContextCreated & {
+import type { PageContextCreatedServer } from '../createPageContextServer.js';
+declare function log404(pageContext: PageContextCreatedServer & {
     urlPathname: string;
     errorWhileRendering: null | Error;
     _globalContext: GlobalContextServerInternal;

package/dist/server/runtime/renderPageServer/log404/index.js

@@ -1,8 +1,13 @@
+import '../../../assertEnvServer.js';
 export { log404 };
 // Exported for ./index.spec.ts
 export { getRoutesInfo };
 import { noRouteMatch } from '../../../../shared-server-client/route/noRouteMatch.js';
-import { assert, assertUsage, assertInfo, compareString, stripAnsi, getTerminalWidth, truncateString, } from '../../../utils.js';
+import { assert, assertUsage, assertInfo } from '../../../../utils/assert.js';
+import { compareString } from '../../../../utils/compareString.js';
+import { stripAnsi } from '../../../../utils/colorsServer.js';
+import { getTerminalWidth } from '../../../../utils/getTerminalWidth.js';
+import { truncateString } from '../../../../utils/truncateString.js';
 import pc from '@brillout/picocolors';
 function log404(pageContext) {
     const { urlPathname } = pageContext;

package/dist/server/runtime/renderPageServer/loggerProd.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { loggRuntimeErrorProd };
 import { type PageContext_logRuntime } from '../loggerRuntime.js';
 declare function loggRuntimeErrorProd(err: unknown, pageContext: PageContext_logRuntime): void;

package/dist/server/runtime/renderPageServer/loggerProd.js

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 // Logger used for the production server.
 // Any other environment (dev, preview, build, and pre-rendering) uses loggerDev.ts instead.
 export { loggRuntimeErrorProd };

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { renderPageServerAfterRoute };
 export { prerenderPage };
 export { prerenderPageEntry };
@@ -5,7 +6,7 @@ export type { PageContextAfterRender };
 import { type PageContextUrlInternal } from '../../../shared-server-client/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { type PageContext_loadPageConfigsLazyServerSide, type PageConfigsLazy } from './loadPageConfigsLazyServerSide.js';
-import type { PageContextCreated } from './createPageContextServerSide.js';
+import type { PageContextCreatedServer } from './createPageContextServer.js';
 import type { PageContextBegin } from '../renderPageServer.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
@@ -18,7 +19,7 @@ declare function renderPageServerAfterRoute<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _requestId: number;
-} & PageContextCreated & PageContextBegin & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+} & PageContextCreatedServer & PageContextBegin & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
 declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry>[0]): Promise<{
     documentHtml: string;
     pageContextSerialized: null;
@@ -29,10 +30,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isClientSide: false;
         isPrerendering: boolean;
         _requestId: number;
-    } & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-        url?: string;
-        headers?: Record<string, string>;
-    } & {
+    } & import("../renderPageServer.js").PageContextInit & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
@@ -150,7 +148,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -193,10 +191,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         isClientSide: false;
         isPrerendering: boolean;
         _requestId: number;
-    } & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-        url?: string;
-        headers?: Record<string, string>;
-    } & {
+    } & import("../renderPageServer.js").PageContextInit & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
@@ -314,7 +309,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -348,7 +343,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         pageContextsAborted: never[];
     };
 }>;
-declare function prerenderPageEntry(pageContext: PageContextCreated & PageConfigsLazy & {
+declare function prerenderPageEntry(pageContext: PageContextCreatedServer & PageConfigsLazy & {
     routeParams: Record<string, string>;
     pageId: string;
     _requestId: number;
@@ -365,10 +360,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreated & PageConfig
         isClientSide: false;
         isPrerendering: boolean;
         _requestId: number;
-    } & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-        url?: string;
-        headers?: Record<string, string>;
-    } & {
+    } & import("../renderPageServer.js").PageContextInit & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
@@ -486,7 +478,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreated & PageConfig
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -529,10 +521,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreated & PageConfig
         isClientSide: false;
         isPrerendering: boolean;
         _requestId: number;
-    } & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-        url?: string;
-        headers?: Record<string, string>;
-    } & {
+    } & import("../renderPageServer.js").PageContextInit & {
         _globalContext: ({
             _globalConfigPublic: {
                 pages: {
@@ -650,7 +639,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreated & PageConfig
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.js

@@ -1,16 +1,21 @@
+import '../../assertEnvServer.js';
 export { renderPageServerAfterRoute };
 export { prerenderPage };
 export { prerenderPageEntry };
 import { getErrorPageId } from '../../../shared-server-client/error-page.js';
 import { getHtmlString } from './html/renderHtml.js';
-import { assert, assertUsage, updateType, hasProp, objectAssign, isSameErrorMessage } from '../../utils.js';
+import { assert, assertUsage } from '../../../utils/assert.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isSameErrorMessage } from '../../../utils/isSameErrorMessage.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { updateType } from '../../../utils/updateType.js';
 import { getPageContextClientSerialized } from './html/serializeContext.js';
-import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
+import { createHttpResponsePage, createHttpResponsePageJson } from './createHttpResponse.js';
 import { loadPageConfigsLazyServerSide, } from './loadPageConfigsLazyServerSide.js';
 import { execHookOnRenderHtml } from './execHookOnRenderHtml.js';
 import { execHookDataAndOnBeforeRender } from './execHookDataAndOnBeforeRender.js';
 import { logRuntimeError } from '../loggerRuntime.js';
-import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+import { getPageContextPublicServer } from './getPageContextPublicServer.js';
 import { execHookGuard } from '../../../shared-server-client/route/execHookGuard.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared-server-client/misc/isServerSideError.js';
@@ -26,7 +31,7 @@ async function renderPageServerAfterRoute(pageContext) {
             getErrorPageId(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs)));
     updateType(pageContext, await loadPageConfigsLazyServerSide(pageContext));
     if (!isError) {
-        await execHookGuard(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext));
+        await execHookGuard(pageContext, (pageContext) => getPageContextPublicServer(pageContext));
     }
     if (!isError) {
         await execHookDataAndOnBeforeRender(pageContext);
@@ -46,7 +51,7 @@ async function renderPageServerAfterRoute(pageContext) {
             objectAssign(pageContext, { [isServerSideError]: true });
         }
         const pageContextSerialized = getPageContextClientSerialized(pageContext, false);
-        const httpResponse = await createHttpResponsePageContextJson(pageContextSerialized);
+        const httpResponse = await createHttpResponsePageJson(pageContextSerialized);
         objectAssign(pageContext, { httpResponse });
         return pageContext;
     }
@@ -77,7 +82,7 @@ async function prerenderPageEntry(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 execHookGuard(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext))
+    await execHookGuard(pageContext, (pageContext) => getPageContextPublicServer(pageContext))
     */
     await execHookDataAndOnBeforeRender(pageContext);
     const { htmlRender, renderHook } = await execHookOnRenderHtml(pageContext);

package/dist/server/runtime/renderPageServer/resolveRedirects.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 export { resolveRouteStringRedirect };

package/dist/server/runtime/renderPageServer/resolveRedirects.js

@@ -1,9 +1,11 @@
+import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 // For ./resolveRedirects.spec.ts
 export { resolveRouteStringRedirect };
 import { assertIsNotBrowser } from '../../../utils/assertIsNotBrowser.js';
-import { assert, assertUsage, assertUsageUrlRedirectTarget, assertWarning, isUrlRedirectTarget, } from '../../../shared-server-client/utils.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { isUrlRedirectTarget, assertUsageUrlRedirectTarget } from '../../../utils/parseUrl.js';
 import { resolveUrlPathname } from '../../../shared-server-client/route/resolveUrlPathname.js';
 import { assertRouteString, isStaticRouteString, resolveRouteString, } from '../../../shared-server-client/route/resolveRouteString.js';
 import pc from '@brillout/picocolors';

package/dist/server/runtime/renderPageServer.d.ts

@@ -1,16 +1,15 @@
+import '../assertEnvServer.js';
 export { renderPageServer };
+export { getRequestTag };
 export type { PageContextInit };
 export type { PageContextBegin };
+export type { RequestTag };
 import { type PageContextAborted } from '../../shared-server-client/route/abort.js';
 import { type GlobalContextServerInternal } from './globalContext.js';
 import { type HttpResponse } from './renderPageServer/createHttpResponse.js';
 import type { PageContextServer } from '../../types/index.js';
-import type { PageContextInternalServer } from '../../types/PageContext.js';
+import type { PageContextInit } from '../../types/PageContext.js';
 import { type AsyncStore } from './asyncHook.js';
-type PageContextInit = Pick<PageContextInternalServer, 'urlOriginal' | 'headersOriginal'> & {
-    /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
-    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
-};
 type PageContextBegin = ReturnType<typeof getPageContextBegin>;
 declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
     httpResponse: HttpResponse;
@@ -22,10 +21,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     isClientSide: false;
     isPrerendering: boolean;
     _requestId: number;
-} & Pick<PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
-    /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
-    /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
-} & {
+} & PageContextInit & {
     _globalContext: ({
         _globalConfigPublic: {
             pages: {
@@ -143,7 +139,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
 } & {
-    urlParsed: import("../utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {
@@ -154,3 +150,5 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _isPageContextJsonRequest: boolean;
     pageContextsAborted: PageContextAborted[];
 };
+type RequestTag = ReturnType<typeof getRequestTag>;
+declare function getRequestTag(requestId: number): `request-${number}`;