vike 0.4.229-commit-845a4e0 → 0.4.229-commit-7056ef0

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -59,10 +59,8 @@ const configDefinitionsBuiltIn = {
         env: { server: true }
     },
     onData: {
-        env: { server: true, client: true }
-        /* TODO/now
+        env: { server: true, client: true },
         cumulative: true
-        */
     },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
         env: { server: true, client: 'if-client-routing' },

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -26,7 +26,7 @@ const resolvePointerImport_js_1 = require("./getVikeConfig/resolvePointerImport.
 const getFilePath_js_1 = require("../../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 const assertExtensions_js_1 = require("./getVikeConfig/assertExtensions.js");
-const getPageConfigUserFriendly_js_1 = require("../../../../../shared/page-configs/getPageConfigUserFriendly.js");
+const getUserFriendlyConfigs_js_1 = require("../../../../../shared/page-configs/getUserFriendlyConfigs.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const getPlusFilesAll_js_1 = require("./getVikeConfig/getPlusFilesAll.js");
 const getEnvVarObject_js_1 = require("../../../shared/getEnvVarObject.js");
@@ -142,7 +142,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: {} }),
+                global: (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsGlobal)({ pageConfigGlobalValues: {} }),
                 pages: {},
                 vikeConfigDependencies: new Set()
             };
@@ -163,13 +163,19 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     // global
     const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
+    const userFriendlyConfigsGlobal = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsGlobal)({ pageConfigGlobalValues });
     // pages
-    const pages = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
+    const userFriendlyConfigsPageEager = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
         const pageConfigValues = getConfigValues(pageConfig, true);
-        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobalValues, pageConfig, pageConfigValues);
+        return (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageEager)(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
-    return { pageConfigs, pageConfigGlobal, global, pages, vikeConfigDependencies: esbuildCache.vikeConfigDependencies };
+    return {
+        pageConfigs,
+        pageConfigGlobal,
+        global: userFriendlyConfigsGlobal,
+        pages: userFriendlyConfigsPageEager,
+        vikeConfigDependencies: esbuildCache.vikeConfigDependencies
+    };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const plusFilesAllOrdered = Object.values(plusFilesAll)

package/dist/cjs/node/prerender/runPrerender.js

@@ -56,7 +56,7 @@ const getConfigValueRuntime_js_1 = require("../../shared/page-configs/getConfigV
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const abort_js_1 = require("../../shared/route/abort.js");
-const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
+const loadPageConfigsLazyServerSide_js_1 = require("../runtime/renderPage/loadPageConfigsLazyServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
@@ -386,7 +386,7 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
             routeParams: {}
         });
     }
-    (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
+    (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     let usesClientRouter;
     {
         const { pageId } = pageContext;

package/dist/cjs/node/runtime/renderPage/createHttpResponse/getCacheControl.js

@@ -10,11 +10,13 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
         return defaultValue;
     if (statusCode > 499)
         return defaultValue;
-    const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
-    const value = configValue?.value;
-    if (value)
-        return value;
+    if (pageId) {
+        const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
+        const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'cacheControl', 'string');
+        const value = configValue?.value;
+        if (value)
+            return value;
+    }
     // - Disabling caching by default is the safest strategy, because caching is problematic with authentication as described in https://github.com/vikejs/vike/issues/1275#issuecomment-1824366875
     // - Are there use cases when we don't need to disable caching?
     //   - When there isn't any <script id="vike_pageContext" type="application/json"> then we can safely have caching. (We don't implement this exception because we're lazy and it's quite a rare situation.)

package/dist/cjs/node/runtime/renderPage/createHttpResponse.js

@@ -31,7 +31,6 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
     const headers = [];
-    (0, utils_js_1.assert)(pageContext.pageId);
     const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext.pageId, pageContext._pageConfigs, statusCode);
     if (cacheControl) {
         headers.push(['Cache-Control', cacheControl]);

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

@@ -35,6 +35,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, globa
         _urlHandler: urlHandler,
         isClientSideNavigation
     });
+    (0, utils_js_1.objectAssign)(pageContextCreated, globalContext._userFriendlyConfigsGlobal);
     // pageContext.urlParsed
     const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContextCreated);
     (0, utils_js_1.objectAssign)(pageContextCreated, pageContextUrlComputed);
@@ -55,7 +56,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, globa
         }
         (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal);
+    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
     (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

package/dist/cjs/node/runtime/renderPage/executeHookServer.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeHookServer = executeHookServer;
+const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
+const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
+async function executeHookServer(hookName, pageContext) {
+    return await (0, executeHook_js_1.executeHookNew)(hookName, pageContext, (p) => {
+        (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(p);
+        return p;
+    });
+}

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

@@ -1,37 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeOnBeforeRenderAndDataHooks = executeOnBeforeRenderAndDataHooks;
-const getHook_js_1 = require("../../../shared/hooks/getHook.js");
-const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
 const assertOnBeforeRenderHookReturn_js_1 = require("../../../shared/assertOnBeforeRenderHookReturn.js");
-const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
+const executeHookServer_js_1 = require("./executeHookServer.js");
 async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;
     }
-    const dataHook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'data');
-    const onBeforeRenderHook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'onBeforeRender');
-    if (!dataHook && !onBeforeRenderHook) {
-        return;
-    }
-    (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
+    const hooks = await (0, executeHookServer_js_1.executeHookServer)('data', pageContext);
+    const dataHook = hooks[0]; // TO-DO/soon: support cumulative
     if (dataHook) {
-        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook, pageContext);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
-            data: hookResult
+            data: dataHook.hookResult
         };
         Object.assign(pageContext, pageContextFromHook);
         // Execute +onData
         if (!pageContext.isClientSideNavigation) {
-            const onDataHook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'onData');
-            if (onDataHook) {
-                await (0, executeHook_js_1.executeHook)(() => onDataHook.hookFn(pageContext), dataHook, pageContext);
-            }
+            await (0, executeHookServer_js_1.executeHookServer)('onData', pageContext);
         }
     }
+    const res = await (0, executeHookServer_js_1.executeHookServer)('onBeforeRender', pageContext);
+    const onBeforeRenderHook = res[0]; // TO-DO/soon: support cumulative
     if (onBeforeRenderHook) {
-        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);
+        const { hookResult } = onBeforeRenderHook;
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

package/dist/cjs/node/runtime/renderPage/{loadUserFilesServerSide.js → loadPageConfigsLazyServerSide.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadUserFilesServerSide = loadUserFilesServerSide;
+exports.loadPageConfigsLazyServerSide = loadPageConfigsLazyServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
-const getPageConfigUserFriendly_js_1 = require("../../../shared/page-configs/getPageConfigUserFriendly.js");
+const getUserFriendlyConfigs_js_1 = require("../../../shared/page-configs/getUserFriendlyConfigs.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
@@ -10,7 +10,7 @@ const debugPageFiles_js_1 = require("./debugPageFiles.js");
 const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig.js");
 const analyzePage_js_1 = require("./analyzePage.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
-async function loadUserFilesServerSide(pageContext) {
+async function loadPageConfigsLazyServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
@@ -102,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly_oldDesign)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -10,7 +10,7 @@ const renderHtml_js_1 = require("../html/renderHtml.js");
 const utils_js_1 = require("../utils.js");
 const serializeContext_js_1 = require("../html/serializeContext.js");
 const createHttpResponse_js_1 = require("./createHttpResponse.js");
-const loadUserFilesServerSide_js_1 = require("./loadUserFilesServerSide.js");
+const loadPageConfigsLazyServerSide_js_1 = require("./loadPageConfigsLazyServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
 const executeOnBeforeRenderAndDataHooks_js_1 = require("./executeOnBeforeRenderAndDataHooks.js");
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
@@ -26,7 +26,7 @@ async function renderPageAlreadyRouted(pageContext) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'string'));
     const isError = pageContext.is404 || !!pageContext.errorWhileRendering;
     (0, utils_js_1.assert)(isError === (pageContext.pageId === (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs)));
-    (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
+    (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     if (!isError) {
         await (0, executeGuardHook_js_1.executeGuardHook)(pageContext, (pageContext) => (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext));
     }

package/dist/cjs/node/runtime/renderPage.js

@@ -22,7 +22,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const serializeContext_js_1 = require("./html/serializeContext.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
-const loadUserFilesServerSide_js_1 = require("./renderPage/loadUserFilesServerSide.js");
+const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     httpRequestsCount: 0
@@ -415,7 +415,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
             (0, utils_js_1.objectAssign)(pageContext, { pageId: errorPageId });
             (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit, true);
-            (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
+            (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
         }

package/dist/cjs/shared/createGlobalContextShared.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextSyncErrMsg = void 0;
 exports.createGlobalContextShared = createGlobalContextShared;
+const utils_js_1 = require("./utils.js");
+const parseGlobResults_js_1 = require("./getPageFiles/parseGlobResults.js");
+const getUserFriendlyConfigs_js_1 = require("./page-configs/getUserFriendlyConfigs.js");
+const executeHook_js_1 = require("./hooks/executeHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
-const getPageConfigsRuntime_js_1 = require("./getPageConfigsRuntime.js");
-const executeHookGeneric_js_1 = require("./hooks/executeHookGeneric.js");
-const utils_js_1 = require("./utils.js");
 async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     const globalContextAddendum = await addGlobalContext?.(globalContext);
@@ -24,7 +25,7 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
         //      - globalContext._viteDevServer.hot.send()
         //        - Send 'full-server-reload' signal whenever a onCreateGlobalContext() function is modified => we need a globalObject to track all hooks and see if one of them is new/modified.
         //        - Seems less idiomatic
-        await (0, executeHookGeneric_js_1.executeHookGenericGlobalCumulative)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext);
+        await (0, executeHook_js_1.executeHookGlobalCumulative)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext);
     }
     else {
         // Singleton: ensure all `globalContext` user-land references are preserved & updated.
@@ -34,7 +35,7 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
     return globalObject.globalContext;
 }
 function createGlobalContextBase(virtualFileExports) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly } = (0, getPageConfigsRuntime_js_1.getPageConfigsRuntime)(virtualFileExports);
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, userFriendlyConfigsGlobal, userFriendlyConfigsPageEager } = getConfigsAll(virtualFileExports);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -47,8 +48,33 @@ function createGlobalContextBase(virtualFileExports) {
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
-        config: globalConfig.config,
-        pages: pageConfigsUserFriendly
+        _userFriendlyConfigsGlobal: userFriendlyConfigsGlobal,
+        config: userFriendlyConfigsGlobal.config,
+        pages: userFriendlyConfigsPageEager
     };
     return globalContext;
 }
+function getConfigsAll(virtualFileExports) {
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(virtualFileExports);
+    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
+    const userFriendlyConfigsGlobal = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsGlobal)({
+        pageConfigGlobalValues: pageConfigGlobal.configValues
+    });
+    const userFriendlyConfigsPageEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        return (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+    }));
+    return {
+        pageFilesAll,
+        allPageIds,
+        pageConfigs,
+        pageConfigGlobal,
+        userFriendlyConfigsGlobal,
+        userFriendlyConfigsPageEager
+    };
+}
+function getAllPageIds(pageFilesAll, pageConfigs) {
+    const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
+    const allPageIds = (0, utils_js_1.unique)(fileIds);
+    const allPageIds2 = pageConfigs.map((p) => p.pageId);
+    return [...allPageIds, ...allPageIds2];
+}

package/dist/cjs/shared/createPageContextShared.js

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPageContextShared = createPageContextShared;
-const executeHookGeneric_js_1 = require("./hooks/executeHookGeneric.js");
-const getPageConfigUserFriendly_js_1 = require("./page-configs/getPageConfigUserFriendly.js");
+const executeHook_js_1 = require("./hooks/executeHook.js");
 const utils_js_1 = require("./utils.js");
-async function createPageContextShared(pageContextCreated, pageConfigGlobal) {
-    const pageConfigGlobalUserFriendly = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({
-        pageConfigGlobalValues: pageConfigGlobal.configValues
-    });
-    (0, utils_js_1.objectAssign)(pageContextCreated, {
-        isPageContext: true,
-        ...pageConfigGlobalUserFriendly
-    }, true);
-    await (0, executeHookGeneric_js_1.executeHookGenericGlobalCumulative)('onCreatePageContext', pageConfigGlobal, pageContextCreated, pageContextCreated);
+async function createPageContextShared(pageContextCreated, pageConfigGlobal, userFriendlyConfigsGlobal) {
+    (0, utils_js_1.objectAssign)(pageContextCreated, { isPageContext: true }, true);
+    (0, utils_js_1.objectAssign)(pageContextCreated, userFriendlyConfigsGlobal);
+    await (0, executeHook_js_1.executeHookGlobalCumulative)('onCreatePageContext', pageConfigGlobal, pageContextCreated, pageContextCreated);
     return pageContextCreated;
 }

package/dist/cjs/shared/hooks/executeHook.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeHook = executeHook;
+exports.executeHookNew = executeHookNew;
+exports.executeHookGlobalCumulative = executeHookGlobalCumulative;
 exports.getPageContext = getPageContext;
 exports.providePageContext = providePageContext;
 exports.isUserHookError = isUserHookError;
@@ -8,10 +10,29 @@ const assert_js_1 = require("../../utils/assert.js");
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const humanizeTime_js_1 = require("../../utils/humanizeTime.js");
 const isObject_js_1 = require("../../utils/isObject.js");
+const getHook_js_1 = require("./getHook.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/executeHook.ts', {
     userHookErrors: new WeakMap(),
     pageContext: null
 });
+// TO-DO/eventually: use this variant more prominently
+async function executeHookNew(hookName, pageContext, prepare) {
+    const hooks = (0, getHook_js_1.getHookFromPageContextNew)(hookName, pageContext);
+    if (!hooks.length)
+        return [];
+    const pageContextPrepared = prepare(pageContext);
+    const hooksWithResult = await Promise.all(hooks.map(async (hook) => {
+        const hookResult = await executeHook(() => hook.hookFn(pageContextPrepared), hook, pageContext);
+        return { ...hook, hookResult };
+    }));
+    return hooksWithResult;
+}
+async function executeHookGlobalCumulative(hookName, pageConfigGlobal, pageContext, arg) {
+    const hooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(pageConfigGlobal, hookName);
+    await Promise.all(hooks.map(async (hook) => {
+        await executeHook(() => hook.hookFn(arg), hook, pageContext);
+    }));
+}
 function isUserHookError(err) {
     if (!(0, isObject_js_1.isObject)(err))
         return false;

package/dist/cjs/shared/hooks/getHook.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHookFromPageContext = getHookFromPageContext;
+exports.getHookFromPageContextNew = getHookFromPageContextNew;
 exports.getHookFromPageConfig = getHookFromPageConfig;
 exports.getHookFromPageConfigGlobal = getHookFromPageConfigGlobal;
 exports.getHookFromPageConfigGlobalCumulative = getHookFromPageConfigGlobalCumulative;
-exports.assertHook = assertHook;
 exports.getHook_setIsPrerenderering = getHook_setIsPrerenderering;
 exports.getHookTimeoutDefault = getHookTimeoutDefault;
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
@@ -25,12 +25,34 @@ function getHookFromPageContext(pageContext, hookName) {
     const hookFn = pageContext.exports[hookName];
     if (hookFn === null)
         return null;
+    // TO-DO/eventually: use pageContext.configEntries in favor of pageContext.exportsAll once V0.4 is removed
     const file = pageContext.exportsAll[hookName][0];
     (0, utils_js_1.assert)(file.exportValue === hookFn);
     const hookFilePath = file.filePath;
     (0, utils_js_1.assert)(hookFilePath);
     return getHook(hookFn, hookName, hookFilePath, hookTimeout);
 }
+// TO-DO/eventually: remove getHookFromPageContext() in favor of getHookFromPageContextNew()
+function getHookFromPageContextNew(hookName, pageContext) {
+    const { hooksTimeout } = pageContext.config;
+    const hookTimeout = getHookTimeout(hooksTimeout, hookName);
+    const hooks = [];
+    /* TO-DO/eventually: use pageContext.configEntries in favor of pageContext.exportsAll once V0.4 is removed
+    pageContext.configEntries[hookName]?.forEach((val) => {
+      const hookFn = val.configValue
+      if (hookFn === null) return
+      const hookFilePath = val.configDefinedByFile
+    */
+    pageContext.exportsAll[hookName]?.forEach((val) => {
+        const hookFn = val.exportValue;
+        if (hookFn === null)
+            return;
+        const hookFilePath = val.filePath;
+        (0, utils_js_1.assert)(hookFilePath);
+        hooks.push(getHook(hookFn, hookName, hookFilePath, hookTimeout));
+    });
+    return hooks;
+}
 function getHookFromPageConfig(pageConfig, hookName) {
     const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, hookName);
     if (!configValue?.value)
@@ -79,9 +101,6 @@ function getHookFromConfigValue(configValue) {
     const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData);
     return { hookFn, hookFilePath };
 }
-function assertHook(pageContext, hookName) {
-    getHookFromPageContext(pageContext, hookName);
-}
 function assertHookFn(hookFn, { hookName, hookFilePath }) {
     (0, utils_js_1.assert)(hookName && hookFilePath);
     (0, utils_js_1.assert)(!hookName.endsWith(')'));

package/dist/cjs/shared/page-configs/{getPageConfigUserFriendly.js → getUserFriendlyConfigs.js}

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageConfigUserFriendly = getPageConfigUserFriendly;
-exports.getPageConfigUserFriendly_oldDesign = getPageConfigUserFriendly_oldDesign;
-exports.getPageConfigGlobalUserFriendly = getPageConfigGlobalUserFriendly;
+exports.getUserFriendlyConfigsGlobal = getUserFriendlyConfigsGlobal;
+exports.getUserFriendlyConfigsPageEager = getUserFriendlyConfigsPageEager;
+exports.getUserFriendlyConfigsPageLazy = getUserFriendlyConfigsPageLazy;
 const assert_exports_old_design_js_1 = require("../getPageFiles/assert_exports_old_design.js");
 const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 const helpers_js_1 = require("./helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues) {
-    const pageConfigUserFriendly = getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues });
+function getUserFriendlyConfigsPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigUserFriendly = getUserFriendlyConfigs_public({ pageConfigGlobalValues, pageConfigValues });
     let page;
     if (!pageConfig.isErrorPage) {
         const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
@@ -29,8 +29,8 @@ function getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfi
     }
     return [pageConfig.pageId, page];
 }
-function getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues }) {
-    const pageConfigUserFriendly = getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues });
+function getUserFriendlyConfigs_public({ pageConfigGlobalValues, pageConfigValues }) {
+    const pageConfigUserFriendly = getUserFriendlyConfigs_base({ pageConfigGlobalValues, pageConfigValues });
     return getPublicCopy(pageConfigUserFriendly);
 }
 function getPublicCopy(pageConfigUserFriendly) {
@@ -42,15 +42,17 @@ function getPublicCopy(pageConfigUserFriendly) {
         _from: p.from
     };
 }
-function getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues }) {
+function getUserFriendlyConfigs_base({ pageConfigGlobalValues, pageConfigValues }) {
     const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
-    return getPageConfigUserFriendly_V1Design({ configValues });
+    return getUserFriendlyConfigs_V1Design({ configValues });
 }
-function getPageConfigGlobalUserFriendly({ pageConfigGlobalValues }) {
-    const pageConfigGlobalUserFriendly = getPageConfigUserFriendly_V1Design({ configValues: pageConfigGlobalValues });
+function getUserFriendlyConfigsGlobal({ pageConfigGlobalValues }) {
+    const pageConfigGlobalUserFriendly = getUserFriendlyConfigs_V1Design({ configValues: pageConfigGlobalValues });
     return getPublicCopy(pageConfigGlobalUserFriendly);
 }
-function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGlobal) {
+function getUserFriendlyConfigsPageLazy(pageFiles, // V0.4 design
+pageConfig, // V1 design
+pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -75,7 +77,7 @@ function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGl
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendly_base({
+        const res = getUserFriendlyConfigs_base({
             pageConfigGlobalValues: pageConfigGlobal.configValues,
             pageConfigValues: pageConfig.configValues
         });
@@ -124,7 +126,7 @@ function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGl
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendly_V1Design(pageConfig) {
+function getUserFriendlyConfigs_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};
@@ -140,19 +142,30 @@ function getPageConfigUserFriendly_V1Design(pageConfig) {
         sources[configName] ?? (sources[configName] = []);
         sources[configName].push(src);
     };
-    Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
-        const { value } = configValue;
-        const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
-        const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAtOptional)('Config', configName, configValue.definedAtData);
-        config[configName] = config[configName] ?? value;
+    const addLegacy = (configName, value, definedAtData) => {
+        const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(definedAtData);
+        const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAtOptional)('Config', configName, definedAtData);
         configEntries[configName] = configEntries[configName] ?? [];
-        // Currently each configName has only one entry. Adding an entry for each overriden config value isn't implemented yet. (This is an isomorphic file and it isn't clear whether this can/should be implemented on the client-side. We should load a minimum amount of code on the client-side.)
-        (0, utils_js_1.assert)(configEntries[configName].length === 0);
         configEntries[configName].push({
             configValue: value,
             configDefinedAt,
             configDefinedByFile: configValueFilePathToShowToUser
         });
+        // TODO/v1-release: remove
+        const exportName = configName;
+        exportsAll[exportName] = exportsAll[exportName] ?? [];
+        exportsAll[exportName].push({
+            exportValue: value,
+            exportSource: configDefinedAt,
+            filePath: configValueFilePathToShowToUser,
+            _filePath: configValueFilePathToShowToUser,
+            _fileType: null,
+            _isFromDefaultExport: null
+        });
+    };
+    Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
+        const { value } = configValue;
+        config[configName] = config[configName] ?? value;
         if (configValue.type === 'standard') {
             const src = {
                 type: 'configsStandard',
@@ -161,6 +174,7 @@ function getPageConfigUserFriendly_V1Design(pageConfig) {
             };
             addSrc(src, configName);
             from.configsStandard[configName] = src;
+            addLegacy(configName, value, configValue.definedAtData);
         }
         if (configValue.type === 'cumulative') {
             const src = {
@@ -169,6 +183,7 @@ function getPageConfigUserFriendly_V1Design(pageConfig) {
                     const definedAtFile = configValue.definedAtData[i];
                     (0, utils_js_1.assert)(definedAtFile);
                     const definedAt = (0, getConfigDefinedAt_js_1.getDefinedAtString)(definedAtFile, configName);
+                    addLegacy(configName, value, definedAtFile);
                     return {
                         value,
                         definedAt
@@ -185,18 +200,8 @@ function getPageConfigUserFriendly_V1Design(pageConfig) {
             };
             addSrc(src, configName);
             from.configsComputed[configName] = src;
+            addLegacy(configName, value, configValue.definedAtData);
         }
-        // TODO/v1-release: remove
-        const exportName = configName;
-        exportsAll[exportName] = exportsAll[exportName] ?? [];
-        exportsAll[exportName].push({
-            exportValue: value,
-            exportSource: configDefinedAt,
-            filePath: configValueFilePathToShowToUser,
-            _filePath: configValueFilePathToShowToUser,
-            _fileType: null,
-            _isFromDefaultExport: null
-        });
     });
     return {
         config: config,

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.229-commit-845a4e0';
+exports.PROJECT_VERSION = '0.4.229-commit-7056ef0';

package/dist/esm/client/client-routing-runtime/{createPageContext.d.ts → createPageContextClientSide.d.ts}

@@ -7,8 +7,17 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         _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: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } & {
         isClientSide: true;
     } & {
@@ -32,9 +41,5 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     urlPathname: string;
     url: string;
 } & {
-    config: import("../../types/index.js").ConfigResolved;
-    _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
-    _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
-    _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
     isPageContext: true;
-}>;
+} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly>;