vike 0.4.171-commit-bb72501 → 0.4.171-commit-f9548df

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';
@@ -59,6 +59,26 @@ type PageContextBuiltInCommon<Data> = {
      * https://vike.dev/renderPage
      */
     urlOriginal: string;
+    /**
+     * The HTTP Headers of the incoming HTTP Request.
+     *
+     * As a string object normalized by Vike.
+     *
+     * See also:
+     * - https://vike.dev/headers
+     * - `pageContext.headersOriginal`
+     */
+    headers: Record<string, string> | null;
+    /**
+     * The HTTP Headers of the incoming HTTP Request.
+     *
+     * The original object provided by the server.
+     *
+     * See also:
+     * - https://vike.dev/headers
+     * - `pageContext.headers`
+     */
+    headersOriginal?: unknown;
     /** If an error occurs, whether the error is a `404 Page Not Found`.
      *
      * https://vike.dev/error-page
@@ -99,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;
@@ -109,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.
@@ -125,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/assert.js

@@ -92,7 +92,7 @@ function assertWarning(condition, msg, { onlyOnce, showStackTrace }) {
     }
     globalObject.onBeforeLog?.();
     if (showStackTrace) {
-        const err = new Error(msg);
+        const err = createErrorWithCleanStackTrace(msg, numberOfStackTraceLinesToRemove);
         globalObject.showStackTraceList.add(err);
         globalObject.logger(err, 'warn');
     }

package/dist/esm/utils/assertNodeVersion.js

@@ -6,5 +6,5 @@ function assertNodeVersion() {
     if (!isNodeJS())
         return;
     const version = process.versions.node;
-    assertVersion('Node.js', version, '16.0.0');
+    assertVersion('Node.js', version, '18.0.0');
 }

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 });
+}

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

@@ -0,0 +1 @@
+export declare function normalizeHeaders(headersOriginal: unknown): Record<string, string>;

package/dist/esm/utils/normalizeHeaders.js

@@ -0,0 +1,9 @@
+export function normalizeHeaders(
+/* This type is precise, too precise which can be annoying: e.g. cannot pass a string[][] argument because it doesn't match the more precise [string,string][] type.
+headersOriginal ConstructorParameters<typeof Headers>[0]
+*/
+headersOriginal) {
+    const headersStandard = new Headers(headersOriginal);
+    const headers = Object.fromEntries(headersStandard.entries());
+    return headers;
+}

package/dist/esm/utils/objectAssign.js

@@ -1,7 +1,7 @@
 export { objectAssign };
 // Same as Object.assign() but:
 //  - With type inference
-//  - Preserves property descriptors, which we need for preserving the getters added by addUrlComputedProps()
+//  - Preserves property descriptors, which we need for preserving the getters added by getPageContextUrlComputed()
 function objectAssign(obj, objAddendum) {
     if (objAddendum) {
         Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));

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

@@ -0,0 +1,4 @@
+/** Like Object.defineProperty() but with type inference */
+export declare function objectDefineProperty<Obj extends object, Prop extends PropertyKey, PropertyType>(obj: Obj, prop: Prop, { get, ...args }: {
+    get: () => PropertyType;
+} & Omit<PropertyDescriptor, 'set' | 'get'>): asserts obj is Obj & Record<Prop, PropertyType>;

package/dist/esm/utils/objectDefineProperty.js

@@ -0,0 +1,4 @@
+/** Like Object.defineProperty() but with type inference */
+export function objectDefineProperty(obj, prop, { get, ...args }) {
+    Object.defineProperty(obj, prop, { ...args, get });
+}

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.171-commit-bb72501";
+declare const PROJECT_VERSION: "0.4.171-commit-f9548df";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.171-commit-bb72501";
+    projectVersion: "0.4.171-commit-f9548df";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.171-commit-bb72501';
+const PROJECT_VERSION = '0.4.171-commit-f9548df';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.171-commit-bb72501",
+  "version": "0.4.171-commit-f9548df",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -216,7 +216,7 @@
     "vite": "npm:@brillout/vite@5.1.0-commit-3dc7abd"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "description": "Like Next.js/Nuxt but as do-one-thing-do-it-well Vite plugin.",
   "repository": "https://github.com/vikejs/vike",