vike 0.4.171-commit-75e1588 → 0.4.171-commit-f9548df

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

@@ -63,13 +63,13 @@ function getRenderHook(pageContext) {
         assertUsage(false, [
             `No ${hookName}() hook found, see https://vike.dev/${hookName}`
             /*
-          'See https://vike.dev/render-modes for more information.',
-          [
-            // 'Loaded config files (none of them define the onRenderHtml() hook):',
-            'Loaded server-side page files (none of them `export { render }`):',
-            ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-          ].join('\n')
-          */
+            'See https://vike.dev/render-modes for more information.',
+            [
+              // 'Loaded config files (none of them define the onRenderHtml() hook):',
+              'Loaded server-side page files (none of them `export { render }`):',
+              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
+            ].join('\n')
+            */
         ].join(' '));
     }
     return hookFound;

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

@@ -14,19 +14,11 @@ type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContex
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     _pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<{
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];
     _pageFilePathsLoaded: string[];
-    source: import("../../../shared/getPageFiles/getExports.js").Source;
-    sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-    from: import("../../../shared/getPageFiles/getExports.js").From;
-    config: Record<string, unknown>;
-    configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-    pageExports: Record<string, unknown>;
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;

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

@@ -10,7 +10,7 @@ import { getGlobalContext } from '../globalContext.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !getGlobalContext().isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
@@ -35,8 +35,8 @@ async function loadUserFilesServerSide(pageContext) {
         });
     }
     const pageContextAddendum = {};
+    objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, {
-        ...pageContextExports,
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
@@ -101,8 +101,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const pageContextExports = getPageContextExports(pageFilesServerSide, pageConfigLoaded);
     return {
-        ...pageContextExports,
-        pageFilesLoaded: pageFilesServerSide,
-        pageConfigLoaded
+        pageContextExports,
+        pageFilesLoaded: pageFilesServerSide
     };
 }

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

@@ -1,6 +1,6 @@
 export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
-import { PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
+import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageContextExports } from '../../../shared/getPageFiles/getExports.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
@@ -9,7 +9,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     /** @deprecated */
     url: string;
     urlPathname: string;
-    urlParsed: PageContextUrlComputedPropsInternal['urlParsed'];
+    urlParsed: PageContextUrlInternal['urlParsed'];
     routeParams: Record<string, string>;
     Page: unknown;
     _pageId: string;

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

@@ -1,10 +1,10 @@
 export { preparePageContextForUserConsumptionServerSide };
 import { assert, isPlainObject, isObject } from '../utils.js';
 import { sortPageContext } from '../../../shared/sortPageContext.js';
-import { assertPageContextUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
+import { assertPageContextUrl } from '../../../shared/getPageContextUrlComputed.js';
 import { addIs404ToPageProps } from '../../../shared/addIs404ToPageProps.js';
 function preparePageContextForUserConsumptionServerSide(pageContext) {
-    assertPageContextUrlComputedProps(pageContext);
+    assertPageContextUrl(pageContext);
     assert(isPlainObject(pageContext.routeParams));
     assert('Page' in pageContext);
     assert(isObject(pageContext.pageExports));

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

@@ -7,7 +7,7 @@ export type { RenderContext };
 export type { PageContextAfterRender };
 export type { PageContextInitEnhanced };
 import { type PageFile } from '../../../shared/getPageFiles.js';
-import { type PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
+import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponseObject.js';
 import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../../shared/page-configs/PageConfig.js';
@@ -24,7 +24,7 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextInitEnhanced & PageContextUrlComputedPropsInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+} & PageContextInitEnhanced & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
 declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles & {
     routeParams: Record<string, string>;
     _pageId: string;
@@ -59,23 +59,17 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -116,23 +110,17 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -174,23 +162,17 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -231,23 +213,17 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-        _urlRewrite: string | null;
     } & {
-        headers: Record<string, string> | null;
+        urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+        urlPathname: string;
+        url: string;
     } & {
+        headers: Record<string, string> | null;
+    } & import("../../../shared/getPageFiles/getExports.js").PageContextExports & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
         _pageFilePathsLoaded: string[];
-        source: import("../../../shared/getPageFiles/getExports.js").Source;
-        sources: import("../../../shared/getPageFiles/getExports.js").Sources;
-        from: import("../../../shared/getPageFiles/getExports.js").From;
-        config: Record<string, unknown>;
-        configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
-        pageExports: Record<string, unknown>;
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -268,8 +244,7 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;
     headersOriginal?: unknown;
     headers?: unknown;
-}, renderContext: RenderContext, { urlComputedPropsNonEnumerable, ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
-    urlComputedPropsNonEnumerable?: boolean;
+}, renderContext: RenderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } }?: {
     ssr?: {
         urlRewrite: null | string;
         urlHandler: null | ((url: string) => string);
@@ -298,8 +273,10 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _urlRewrite: string | null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
-    _urlRewrite: string | null;
+} & {
+    urlParsed: import("../../../shared/getPageContextUrlComputed.js").Url;
+    urlPathname: string;
+    url: string;
 } & {
     headers: Record<string, string> | null;
 };

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

@@ -8,7 +8,7 @@ import { getHtmlString } from '../html/renderHtml.js';
 import { getPageFilesAll } from '../../../shared/getPageFiles.js';
 import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
-import { addUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
+import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { getGlobalContext } from '../globalContext.js';
 import { createHttpResponseObject, createHttpResponsePageContextJson } from './createHttpResponseObject.js';
 import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
@@ -116,7 +116,7 @@ async function prerender404Page(renderContext, pageContextInit_) {
     objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
     return prerenderPage(pageContext);
 }
-function getPageContextInitEnhanced(pageContextInit, renderContext, { urlComputedPropsNonEnumerable = false, ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
+function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,
     isClientSideNavigation: false
@@ -144,7 +144,8 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
         isClientSideNavigation
     });
     // pageContext.urlParsed
-    addUrlComputedProps(pageContextInitEnhanced, !urlComputedPropsNonEnumerable);
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContextInitEnhanced);
+    objectAssign(pageContextInitEnhanced, pageContextUrlComputed);
     // pageContext.headers
     {
         let headers;

package/dist/esm/shared/{addUrlComputedProps.d.ts → getPageContextUrlComputed.d.ts}

@@ -1,9 +1,9 @@
-export { addUrlComputedProps };
-export { assertPageContextUrlComputedProps };
-export type { PageContextUrlComputedPropsInternal };
-export type { PageContextUrlComputedPropsClient };
-export type { PageContextUrlComputedPropsServer };
-export type { PageContextUrlSources };
+export { getPageContextUrlComputed };
+export { assertPageContextUrl };
+export type { PageContextUrlInternal };
+export type { PageContextUrlClient };
+export type { PageContextUrlServer };
+export type { PageContextUrlSource };
 export type { Url };
 type Url = {
     /** The URL origin, e.g. `https://example.com` of `https://example.com/product/42?details=yes#reviews` */
@@ -27,23 +27,24 @@ type Url = {
     /** @deprecated */
     searchString: null | string;
 };
-type PageContextUrlComputedPropsClient = {
+type PageContextUrlComputed = {
+    /** Parsed information about the current URL */
+    urlParsed: Url;
+    /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
+    urlPathname: string;
     /** @deprecated */
     url: string;
+};
+type PageContextUrl = {
     /** The URL of the HTTP request */
     urlOriginal: string;
-    /** The URL pathname, e.g. `/product/42` of `https://example.com/product/42?details=yes#reviews` */
-    urlPathname: string;
-    /** Parsed information about the current URL */
-    urlParsed: Url;
-};
-/** For Vike internal use */
-type PageContextUrlComputedPropsInternal = PageContextUrlComputedPropsClient & {
+} & PageContextUrlComputed;
+type PageContextUrlInternal = PageContextUrl & {
     _urlRewrite: string | null;
 };
-type HashProps = 'hash' | 'hashString' | 'hashOriginal';
-type PageContextUrlComputedPropsServer = PageContextUrlComputedPropsClient & {
-    urlParsed: Omit<PageContextUrlComputedPropsClient['urlParsed'], HashProps> & {
+type PageContextUrlClient = PageContextUrl;
+type PageContextUrlServer = PageContextUrl & {
+    urlParsed: Omit<PageContextUrl['urlParsed'], HashProps> & {
         /** Only available on the client-side */
         hash: '';
         /** Only available on the client-side */
@@ -52,14 +53,15 @@ type PageContextUrlComputedPropsServer = PageContextUrlComputedPropsClient & {
         hashOriginal: null;
     };
 };
-declare function addUrlComputedProps<PageContext extends Record<string, unknown> & PageContextUrlSources>(pageContext: PageContext, enumerable?: boolean): asserts pageContext is PageContext & PageContextUrlComputedPropsInternal;
-type PageContextUrlSources = {
+type HashProps = 'hash' | 'hashString' | 'hashOriginal';
+declare function getPageContextUrlComputed(pageContext: PageContextUrlSource): PageContextUrlComputed;
+type PageContextUrlSource = {
     urlOriginal: string;
     urlLogical?: string;
     _urlRewrite: string | null;
     _baseServer: string;
     _urlHandler: null | ((url: string) => string);
 };
-declare function assertPageContextUrlComputedProps(pageContext: {
+declare function assertPageContextUrl(pageContext: {
     urlOriginal: string;
-} & PageContextUrlComputedPropsClient): void;
+} & PageContextUrlClient): void;

package/dist/esm/shared/{addUrlComputedProps.js → getPageContextUrlComputed.js}

@@ -1,45 +1,31 @@
-// URLs props need to be computed props, because the user can modify the URL e.g. with onBeforeRoute() for i18n
-export { addUrlComputedProps };
-export { assertPageContextUrlComputedProps };
-import { assert, parseUrl, assertWarning, isPlainObject, isPropertyGetter, isBrowser } from './utils.js';
-function addUrlComputedProps(pageContext, enumerable = true) {
-    assert(pageContext.urlOriginal);
-    if ('urlPathname' in pageContext) {
-        assert(typeof pageContext.urlPathname === 'string');
-        /* If the following assert() fails then it's most likely because Object.assign() was used instead of objectAssign(), i.e.:
-           ```js
-           // Add property getters such as pageContext.urlPathname to pageContext
-           addUrlComputedProps(pageContext)
-           // ❌ Breaks the property getters of pageContext set by addUrlComputedProps() such as pageContext.urlPathname
-           Object.assign(pageContext2, pageContext)
-           // ❌ Also breaks the property getters
-           const pageContext3 = { ...pageContext }
-           // ✅ Preserves property getters of pageContext (see objectAssign() implementation)
-           objectAssign(pageContext2, pageContext)
-           ```
-        */
-        assert(isPropertyGetter(pageContext, 'urlPathname'));
-    }
-    if ('urlParsed' in pageContext)
-        assert(isPropertyGetter(pageContext, 'urlParsed'));
-    // TODO/v1-release: move pageContext.urlParsed to pageContext.url
-    if ('url' in pageContext)
-        assert(isPropertyGetter(pageContext, 'url'));
-    Object.defineProperty(pageContext, 'urlPathname', {
+export { getPageContextUrlComputed };
+export { assertPageContextUrl };
+// =====================
+// File determining the URL logic.
+// URLs need to be computed, because the user can modify the URL e.g. with onBeforeRoute() for i18n.
+// =====================
+import { objectDefineProperty } from '../utils/objectDefineProperty.js';
+import { assert, parseUrl, assertWarning, isPlainObject, isPropertyGetter, isBrowser, changeEnumerable } from './utils.js';
+function getPageContextUrlComputed(pageContext) {
+    assert(typeof pageContext.urlOriginal === 'string');
+    assertPageContextUrlComputed(pageContext);
+    const pageContextUrlComputed = {};
+    objectDefineProperty(pageContextUrlComputed, 'urlPathname', {
         get: urlPathnameGetter,
-        enumerable,
+        enumerable: true,
         configurable: true
     });
-    Object.defineProperty(pageContext, 'url', {
+    objectDefineProperty(pageContextUrlComputed, 'url', {
         get: urlGetter,
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(pageContext, 'urlParsed', {
+    objectDefineProperty(pageContextUrlComputed, 'urlParsed', {
         get: urlParsedGetter,
-        enumerable,
+        enumerable: true,
         configurable: true
     });
+    return pageContextUrlComputed;
 }
 function getUrlParsed(pageContext) {
     // We need a url handler function because the onBeforeRoute() hook may set pageContext.urlLogical (typically for i18n)
@@ -90,7 +76,7 @@ function urlParsedGetter() {
     const { origin, pathname, pathnameOriginal, search, searchAll, searchOriginal, hash, hashOriginal } = urlParsedOriginal;
     const hashIsAvailable = isBrowser();
     const warnHashNotAvailable = (prop) => {
-        assertWarning(hashIsAvailable, `pageContext.urlParsed.${prop} isn't available on the server-side (HTTP requests don't include the URL hash by design)`, { onlyOnce: true, showStackTrace: true });
+        assertWarning(hashIsAvailable, `pageContext.urlParsed.${prop} isn't available on the server-side (HTTP requests don't include the URL hash)`, { onlyOnce: true, showStackTrace: true });
     };
     const urlParsed = {
         origin,
@@ -120,21 +106,43 @@ function urlParsedGetter() {
             return searchOriginal;
         }
     };
-    makeNonEnumerable(urlParsed, 'hashString');
-    makeNonEnumerable(urlParsed, 'searchString');
+    changeEnumerable(urlParsed, 'hashString', false);
+    changeEnumerable(urlParsed, 'searchString', false);
     if (!hashIsAvailable) {
-        makeNonEnumerable(urlParsed, 'hash');
-        makeNonEnumerable(urlParsed, 'hashOriginal');
+        changeEnumerable(urlParsed, 'hash', false);
+        changeEnumerable(urlParsed, 'hashOriginal', false);
     }
     return urlParsed;
 }
-function makeNonEnumerable(obj, prop) {
-    const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
-    Object.defineProperty(obj, prop, { ...descriptor, enumerable: false });
-}
-function assertPageContextUrlComputedProps(pageContext) {
+function assertPageContextUrl(pageContext) {
     assert(typeof pageContext.urlOriginal === 'string');
     assert(typeof pageContext.urlPathname === 'string');
     assert(isPlainObject(pageContext.urlParsed));
     assert(pageContext.urlPathname === pageContext.urlParsed.pathname);
+    assertPageContextUrlComputed(pageContext);
+}
+function assertPageContextUrlComputed(pageContext) {
+    /*
+    If the isPropertyGetter() assertions fail then it's most likely because Object.assign() was used instead of `objectAssign()`:
+    ```js
+    const PageContextUrlComputed = getPageContextUrlComputed(pageContext)
+  
+    // ❌ Breaks the property getters of pageContext set by getPageContextUrlComputed() such as pageContext.urlPathname
+    Object.assign(pageContext, pageContextUrlComputed)
+  
+    // ❌ Also breaks property getters
+    const pageContext = { ...pageContextUrlComputed }
+  
+    // ✅ Preserves property getters of pageContext (see objectAssign() implementation)
+    objectAssign(pageContext, pageContextUrlComputed)
+    ```
+    */
+    if ('urlPathname' in pageContext) {
+        assert(typeof pageContext.urlPathname === 'string');
+        assert(isPropertyGetter(pageContext, 'urlPathname'));
+    }
+    if ('urlParsed' in pageContext)
+        assert(isPropertyGetter(pageContext, 'urlParsed'));
+    if ('url' in pageContext)
+        assert(isPropertyGetter(pageContext, 'url'));
 }

package/dist/esm/shared/route/index.d.ts

@@ -4,18 +4,18 @@ export type { PageContextFromRoute };
 export type { PageRoutes };
 export type { RouteMatches };
 import type { PageFile } from '../getPageFiles.js';
-import { PageContextUrlComputedPropsInternal, PageContextUrlSources } from '../addUrlComputedProps.js';
+import { type PageContextUrlInternal, type PageContextUrlSource } from '../getPageContextUrlComputed.js';
 import type { PageRoutes, RouteType } from './loadPageRoutes.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
 import type { Hook } from '../hooks/getHook.js';
-type PageContextForRoute = PageContextUrlComputedPropsInternal & {
+type PageContextForRoute = PageContextUrlInternal & {
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
     _allPageIds: string[];
     _pageConfigGlobal: PageConfigGlobalRuntime;
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: Hook | null;
-} & PageContextUrlSources;
+} & PageContextUrlSource;
 type PageContextFromRoute = {
     _pageId: string | null;
     routeParams: Record<string, string>;

package/dist/esm/shared/route/index.js

@@ -6,7 +6,7 @@ if (isBrowser()) {
     assertClientRouting();
 }
 import { assert, assertUsage, isPlainObject, objectAssign } from './utils.js';
-import { addUrlComputedProps } from '../addUrlComputedProps.js';
+import { assertPageContextUrl } from '../getPageContextUrlComputed.js';
 import { resolvePrecendence } from './resolvePrecedence.js';
 import { resolveRouteString } from './resolveRouteString.js';
 import { resolveRouteFunction } from './resolveRouteFunction.js';
@@ -15,7 +15,7 @@ import { debug } from './debug.js';
 import pc from '@brillout/picocolors';
 async function route(pageContextForRoute) {
     debug('Pages routes:', pageContextForRoute._pageRoutes);
-    addUrlComputedProps(pageContextForRoute);
+    assertPageContextUrl(pageContextForRoute);
     const pageContextFromRoute = {};
     // onBeforeRoute()
     const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContextForRoute);

package/dist/esm/shared/route/resolveRouteFunction.d.ts

@@ -2,8 +2,8 @@ export { resolveRouteFunction };
 export { assertRouteParams };
 export { assertSyncRouting };
 export { warnDeprecatedAllowKey };
-import { PageContextUrlComputedPropsInternal } from '../addUrlComputedProps.js';
-declare function resolveRouteFunction(routeFunction: Function, pageContext: PageContextUrlComputedPropsInternal, routeDefinedAtString: string): Promise<null | {
+import { PageContextUrlInternal } from '../getPageContextUrlComputed.js';
+declare function resolveRouteFunction(routeFunction: Function, pageContext: PageContextUrlInternal, routeDefinedAtString: string): Promise<null | {
     precedence: number | null;
     routeParams: Record<string, string>;
 }>;

package/dist/esm/shared/route/resolveRouteFunction.js

@@ -2,11 +2,11 @@ export { resolveRouteFunction };
 export { assertRouteParams };
 export { assertSyncRouting };
 export { warnDeprecatedAllowKey };
-import { assertPageContextUrlComputedProps } from '../addUrlComputedProps.js';
+import { assertPageContextUrl } from '../getPageContextUrlComputed.js';
 import { assert, assertUsage, assertWarning, hasProp, isPlainObject, isPromise } from './utils.js';
 import pc from '@brillout/picocolors';
 async function resolveRouteFunction(routeFunction, pageContext, routeDefinedAtString) {
-    assertPageContextUrlComputedProps(pageContext);
+    assertPageContextUrl(pageContext);
     let result = routeFunction(pageContext);
     assertSyncRouting(result, `The Route Function ${routeDefinedAtString}`);
     // TODO/v1-release: make resolveRouteFunction() and route() sync

package/dist/esm/shared/types.d.ts

@@ -7,7 +7,7 @@ export { PageContextBuiltInServerInternal };
 export { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
 export { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
 export { PageContextBuiltInClientWithServerRouting_deprecated as PageContextBuiltInClientWithServerRouting };
-import type { PageContextUrlComputedPropsInternal, PageContextUrlComputedPropsClient, PageContextUrlComputedPropsServer } from './addUrlComputedProps.js';
+import type { PageContextUrlInternal, PageContextUrlClient, PageContextUrlServer } from './getPageContextUrlComputed.js';
 import type { ConfigEntries, ExportsAll, From, Source, Sources } from './getPageFiles/getExports.js';
 import type { Config } from './page-configs/Config.js';
 import type { PageContextConfig } from './page-configs/Config/PageContextConfig.js';
@@ -119,7 +119,7 @@ type PageContextBuiltInCommon<Data> = {
     /** @deprecated */
     pageExports: Record<string, unknown>;
 };
-type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlComputedPropsServer;
+type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer;
 type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'source' | 'sources' | 'from'> & {
     /** Whether the current page is already rendered to HTML */
     isHydration: boolean;
@@ -129,7 +129,7 @@ type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltI
      * The value is `true` when the user clicks on his browser's backward navigation button, or when invoking `history.back()`.
      */
     isBackwardNavigation: boolean | null;
-} & PageContextUrlComputedPropsClient;
+} & PageContextUrlClient;
 type PageContextBuiltInClientWithServerRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'pageExports' | 'exports' | 'abortReason' | 'data'> & {
     /**
      * Whether the current page is already rendered to HTML.
@@ -145,7 +145,7 @@ type PageContextBuiltInClientWithServerRouting<Data> = Partial<PageContextBuiltI
     isBackwardNavigation: null;
 };
 /** For Vike internal use */
-type PageContextBuiltInServerInternal = Omit<PageContextBuiltInCommon<unknown> & PageContextUrlComputedPropsInternal, 'data'>;
+type PageContextBuiltInServerInternal = Omit<PageContextBuiltInCommon<unknown> & PageContextUrlInternal, 'data'>;
 /** @deprecated
  * Replace:
  *   ```

package/dist/esm/shared/utils.d.ts

@@ -21,3 +21,5 @@ export * from '../utils/checkType.js';
 export * from '../utils/getValuePrintable.js';
 export * from '../utils/escapeRegex.js';
 export * from '../utils/isArray.js';
+export * from '../utils/changeEnumerable.js';
+export * from '../utils/objectDefineProperty.js';

package/dist/esm/shared/utils.js

@@ -25,3 +25,5 @@ export * from '../utils/checkType.js';
 export * from '../utils/getValuePrintable.js';
 export * from '../utils/escapeRegex.js';
 export * from '../utils/isArray.js';
+export * from '../utils/changeEnumerable.js';
+export * from '../utils/objectDefineProperty.js';

package/dist/esm/types/index.d.ts

@@ -10,7 +10,7 @@ export type { Config, ConfigMeta as Meta, DataAsync, DataSync, GuardAsync, Guard
 export type { ConfigEnv } from '../shared/page-configs/PageConfig.js';
 export type { ConfigDefinition, ConfigEffect } from '../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
 export type { ConfigEntries } from '../shared/getPageFiles/getExports.js';
-export type { Url } from '../shared/addUrlComputedProps.js';
+export type { Url } from '../shared/getPageContextUrlComputed.js';
 export type { InjectFilterEntry } from '../node/runtime/html/injectAssets/getHtmlTags.js';
 export { defineConfig } from './defineConfig.js';
 import type { ConfigEnv } from '../shared/page-configs/PageConfig.js';

package/dist/esm/utils/changeEnumerable.d.ts

@@ -0,0 +1,2 @@
+/** Change enumerability of an object property. */
+export declare function changeEnumerable(obj: Object, prop: string, enumerable: boolean): void;

package/dist/esm/utils/changeEnumerable.js

@@ -0,0 +1,5 @@
+/** Change enumerability of an object property. */
+export function changeEnumerable(obj, prop, enumerable) {
+    const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
+    Object.defineProperty(obj, prop, { ...descriptor, enumerable });
+}