vike 0.4.239-commit-59f1017 → 0.4.239-commit-4d0d950

package/dist/cjs/shared/route/execHookOnBeforeRoute.js

@@ -1,84 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execHookOnBeforeRoute = execHookOnBeforeRoute;
-const assertPageContextProvidedByUser_js_1 = require("../assertPageContextProvidedByUser.js");
-const utils_js_1 = require("./utils.js");
-const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const execHook_js_1 = require("../hooks/execHook.js");
-const preparePageContextForPublicUsage_js_1 = require("../preparePageContextForPublicUsage.js");
-async function execHookOnBeforeRoute(pageContext) {
-    const pageContextFromOnBeforeRouteHook = {};
-    if (!pageContext._globalContext._onBeforeRouteHook)
-        return null;
-    const pageContextFromHook = await getPageContextFromHook(pageContext._globalContext._onBeforeRouteHook, pageContext);
-    if (pageContextFromHook) {
-        (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, pageContextFromHook);
-        if ((0, utils_js_1.hasProp)(pageContextFromOnBeforeRouteHook, 'pageId', 'string') ||
-            (0, utils_js_1.hasProp)(pageContextFromOnBeforeRouteHook, 'pageId', 'null')) {
-            // We bypass Vike's routing
-            if (!(0, utils_js_1.hasProp)(pageContextFromOnBeforeRouteHook, 'routeParams')) {
-                (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, { routeParams: {} });
-            }
-            else {
-                (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextFromOnBeforeRouteHook, 'routeParams', 'object'));
-            }
-            (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
-                _routingProvidedByOnBeforeRouteHook: true,
-            });
-            return pageContextFromOnBeforeRouteHook;
-        }
-    }
-    (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
-        _routingProvidedByOnBeforeRouteHook: false,
-    });
-    return pageContextFromOnBeforeRouteHook;
-}
-async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
-    let { hookReturn } = (0, execHook_js_1.execHookDirectSync)(onBeforeRouteHook, pageContext, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage);
-    (0, resolveRouteFunction_js_1.assertSyncRouting)(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
-    // TO-DO/next-major-release: make execHookOnBeforeRoute() and route() sync
-    hookReturn = await hookReturn;
-    const errPrefix = `The onBeforeRoute() hook defined by ${onBeforeRouteHook.hookFilePath}`;
-    (0, utils_js_1.assertUsage)(hookReturn === null ||
-        hookReturn === undefined ||
-        ((0, utils_js_1.isObjectWithKeys)(hookReturn, ['pageContext']) && (0, utils_js_1.hasProp)(hookReturn, 'pageContext')), `${errPrefix} should return ${picocolors_1.default.cyan('null')}, ${picocolors_1.default.cyan('undefined')}, or a plain JavaScript object ${picocolors_1.default.cyan('{ pageContext: { /* ... */ } }')}`);
-    if (hookReturn === null || hookReturn === undefined) {
-        return null;
-    }
-    (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(hookReturn, 'pageContext', 'object'), `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext }')} but pageContext should be a plain JavaScript object.`);
-    if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId') && !(0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId', 'null')) {
-        const errPrefix2 = `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { pageId } }')} but ${picocolors_1.default.cyan('pageId')} should be`;
-        (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId', 'string'), `${errPrefix2} a string or null`);
-        (0, utils_js_1.assertUsage)(pageContext._globalContext._allPageIds.includes(hookReturn.pageContext.pageId), `${errPrefix2} ${(0, utils_js_1.joinEnglish)(pageContext._globalContext._allPageIds.map((s) => picocolors_1.default.cyan(s)), 'or')}`);
-    }
-    if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'routeParams')) {
-        (0, resolveRouteFunction_js_1.assertRouteParams)(hookReturn.pageContext, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { routeParams } }')} but routeParams should`);
-    }
-    const deprecatedReturn = (prop) => `${errPrefix} returned ${picocolors_1.default.cyan(`{ pageContext: { ${prop} } }`)} which is deprecated. Return ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} instead.`;
-    if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'url')) {
-        (0, utils_js_1.assertWarning)(false, deprecatedReturn('url'), { onlyOnce: true });
-        hookReturn.pageContext.urlLogical = hookReturn.pageContext.url;
-        delete hookReturn.pageContext.url;
-    }
-    if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlOriginal')) {
-        (0, utils_js_1.assertWarning)(false, deprecatedReturn('urlOriginal'), { onlyOnce: true });
-        hookReturn.pageContext.urlLogical = hookReturn.pageContext.urlOriginal;
-        delete hookReturn.pageContext.urlOriginal;
-    }
-    if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlLogical')) {
-        (0, utils_js_1.assertUsageUrlPathnameAbsolute)(
-        // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
-        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} and ${picocolors_1.default.cyan('urlLogical')}`);
-    }
-    (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {
-        hookFilePath: onBeforeRouteHook.hookFilePath,
-        hookName: 'onBeforeRoute',
-    });
-    const pageContextAddendumHook = {};
-    (0, utils_js_1.objectAssign)(pageContextAddendumHook, hookReturn.pageContext);
-    return pageContextAddendumHook;
-}

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

@@ -1,107 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.route = route;
-// Ensure we don't bloat runtime of Server Routing
-const assertRoutingType_js_1 = require("../../utils/assertRoutingType.js");
-const isBrowser_js_1 = require("../../utils/isBrowser.js");
-if ((0, isBrowser_js_1.isBrowser)()) {
-    (0, assertRoutingType_js_1.assertClientRouting)();
-}
-const utils_js_1 = require("./utils.js");
-const resolvePrecedence_js_1 = require("./resolvePrecedence.js");
-const resolveRouteString_js_1 = require("./resolveRouteString.js");
-const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
-const execHookOnBeforeRoute_js_1 = require("./execHookOnBeforeRoute.js");
-const debug_js_1 = require("./debug.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-// TO-DO/next-major-release: make it sync
-async function route(pageContext, skipOnBeforeRouteHook) {
-    (0, debug_js_1.debug)('Pages routes:', pageContext._globalContext._pageRoutes);
-    const pageContextFromRoute = {};
-    // onBeforeRoute()
-    if (!skipOnBeforeRouteHook) {
-        const pageContextFromOnBeforeRouteHook = await (0, execHookOnBeforeRoute_js_1.execHookOnBeforeRoute)(pageContext);
-        if (pageContextFromOnBeforeRouteHook) {
-            if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
-                (0, utils_js_1.assert)(pageContextFromOnBeforeRouteHook.pageId);
-                return pageContextFromOnBeforeRouteHook;
-            }
-            else {
-                (0, utils_js_1.objectAssign)(pageContextFromRoute, pageContextFromOnBeforeRouteHook);
-            }
-        }
-        // We take into account pageContext.urlLogical set by onBeforeRoute()
-        (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
-    }
-    // Vike's routing
-    const allPageIds = pageContext._globalContext._allPageIds;
-    (0, utils_js_1.assertUsage)(allPageIds.length > 0, 'No page found. You must create at least one page.');
-    (0, utils_js_1.assert)(pageContext._globalContext._pageFilesAll.length > 0 || pageContext._globalContext._pageConfigs.length > 0);
-    const { urlPathname } = pageContext;
-    (0, utils_js_1.assert)(urlPathname.startsWith('/'));
-    const routeMatches = [];
-    await Promise.all(pageContext._globalContext._pageRoutes.map(async (pageRoute) => {
-        const { pageId, routeType } = pageRoute;
-        // Filesystem Routing
-        if (pageRoute.routeType === 'FILESYSTEM') {
-            const { routeString } = pageRoute;
-            const match = (0, resolveRouteString_js_1.resolveRouteString)(routeString, urlPathname);
-            if (match) {
-                const { routeParams } = match;
-                routeMatches.push({ pageId, routeParams, routeString, routeType });
-            }
-            return;
-        }
-        // Route String defined in `.page.route.js`
-        if (pageRoute.routeType === 'STRING') {
-            const { routeString } = pageRoute;
-            const match = (0, resolveRouteString_js_1.resolveRouteString)(routeString, urlPathname);
-            if (match) {
-                const { routeParams } = match;
-                (0, utils_js_1.assert)(routeType === 'STRING');
-                routeMatches.push({
-                    pageId,
-                    routeString,
-                    routeParams,
-                    routeType,
-                });
-            }
-            return;
-        }
-        // Route Function defined in `.page.route.js`
-        if (pageRoute.routeType === 'FUNCTION') {
-            const { routeFunction, routeFunctionFilePath } = pageRoute;
-            const match = await (0, resolveRouteFunction_js_1.resolveRouteFunction)(routeFunction, pageContext, routeFunctionFilePath);
-            if (match) {
-                const { routeParams, precedence } = match;
-                routeMatches.push({ pageId, precedence, routeParams, routeType });
-            }
-            return;
-        }
-        (0, utils_js_1.assert)(false);
-    }));
-    (0, resolvePrecedence_js_1.resolvePrecedence)(routeMatches);
-    const winner = routeMatches[0] ?? null;
-    (0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
-    // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
-    (0, utils_js_1.objectAssign)(pageContextFromRoute, { _routeMatch: winner });
-    if (!winner) {
-        (0, utils_js_1.objectAssign)(pageContextFromRoute, {
-            pageId: null,
-            routeParams: {},
-        });
-        return pageContextFromRoute;
-    }
-    {
-        const { routeParams } = winner;
-        (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(routeParams));
-        (0, utils_js_1.objectAssign)(pageContextFromRoute, {
-            pageId: winner.pageId,
-            routeParams: winner.routeParams,
-        });
-    }
-    return pageContextFromRoute;
-}

package/dist/cjs/shared/route/loadPageRoutes.js

@@ -1,197 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPageRoutes = loadPageRoutes;
-exports.loadPageRoutesSync = loadPageRoutesSync;
-const error_page_js_1 = require("../error-page.js");
-const utils_js_1 = require("./utils.js");
-const deduceRouteStringFromFilesystemPath_js_1 = require("./deduceRouteStringFromFilesystemPath.js");
-const utils_js_2 = require("../utils.js");
-const getConfigValueRuntime_js_1 = require("../page-configs/getConfigValueRuntime.js");
-const getConfigDefinedAt_js_1 = require("../page-configs/getConfigDefinedAt.js");
-const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
-const getHook_js_1 = require("../hooks/getHook.js");
-async function loadPageRoutes(
-// Remove all arguments and use GlobalContextServerInternal instead?
-pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
-    // TO-DO/next-major-release: remove this line, remove this function, rename loadPageRoutesSync() to loadPageRoutes()
-    await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));
-    return loadPageRoutesSync(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-}
-function loadPageRoutesSync(
-// Remove all arguments and use GlobalContextServerInternal instead?
-pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
-    const { onBeforeRouteHook, filesystemRoots } = getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal);
-    const pageRoutes = getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds);
-    return { pageRoutes, onBeforeRouteHook };
-}
-function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
-    const pageRoutes = [];
-    // V1 Design
-    if (pageConfigs.length > 0) {
-        (0, utils_js_1.assert)(filesystemRoots === null);
-        const comesFromV1PageConfig = true;
-        pageConfigs
-            .filter((p) => !p.isErrorPage)
-            .forEach((pageConfig) => {
-            const pageId = pageConfig.pageId;
-            let pageRoute = null;
-            {
-                const configName = 'route';
-                const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, configName);
-                if (configValue) {
-                    const route = configValue.value;
-                    (0, utils_js_1.assert)(configValue.definedAtData);
-                    const definedAtString = (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName);
-                    if (typeof route === 'string') {
-                        pageRoute = {
-                            pageId,
-                            comesFromV1PageConfig,
-                            routeString: route,
-                            routeDefinedAtString: definedAtString,
-                            routeType: 'STRING',
-                        };
-                    }
-                    else {
-                        const { definedAtData } = configValue;
-                        (0, utils_js_1.assert)(!(0, utils_js_2.isArray)(definedAtData) && !definedAtData.definedBy);
-                        const { filePathToShowToUser } = definedAtData;
-                        (0, utils_js_1.assert)(filePathToShowToUser);
-                        (0, utils_js_1.assert)((0, utils_js_2.isCallable)(route));
-                        // TO-DO/next-major-release: remove
-                        if ((0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'iKnowThePerformanceRisksOfAsyncRouteFunctions', 'boolean'))
-                            (0, resolveRouteFunction_js_1.warnDeprecatedAllowKey)();
-                        pageRoute = {
-                            pageId,
-                            comesFromV1PageConfig,
-                            routeFunction: route,
-                            routeFunctionFilePath: filePathToShowToUser,
-                            routeDefinedAtString: definedAtString,
-                            routeType: 'FUNCTION',
-                        };
-                    }
-                }
-            }
-            if (!pageRoute) {
-                const { routeFilesystem } = pageConfig;
-                (0, utils_js_1.assert)(routeFilesystem);
-                const { routeString, definedAtLocation } = routeFilesystem;
-                (0, utils_js_1.assert)(routeFilesystem.routeString.startsWith('/'));
-                pageRoute = {
-                    pageId,
-                    routeFilesystemDefinedBy: definedAtLocation,
-                    comesFromV1PageConfig,
-                    routeString,
-                    routeDefinedAtString: null,
-                    routeType: 'FILESYSTEM',
-                };
-            }
-            (0, utils_js_1.assert)(pageRoute);
-            pageRoutes.push(pageRoute);
-        });
-    }
-    // Old design
-    // TO-DO/next-major-release: remove
-    if (pageConfigs.length === 0) {
-        (0, utils_js_1.assert)(filesystemRoots);
-        const comesFromV1PageConfig = false;
-        allPageIds
-            .filter((pageId) => !(0, error_page_js_1.isErrorPageId)(pageId, false))
-            .forEach((pageId) => {
-            const pageRouteFile = pageFilesAll.find((p) => p.pageId === pageId && p.fileType === '.page.route');
-            if (!pageRouteFile || !('default' in pageRouteFile.fileExports)) {
-                const routeString = (0, deduceRouteStringFromFilesystemPath_js_1.deduceRouteStringFromFilesystemPath)(pageId, filesystemRoots);
-                (0, utils_js_1.assert)(routeString.startsWith('/'));
-                (0, utils_js_1.assert)(!routeString.endsWith('/') || routeString === '/');
-                pageRoutes.push({
-                    pageId,
-                    comesFromV1PageConfig,
-                    routeString,
-                    routeDefinedAtString: null,
-                    routeFilesystemDefinedBy: `${pageId}.page.*`,
-                    routeType: 'FILESYSTEM',
-                });
-            }
-            else {
-                const { filePath, fileExports } = pageRouteFile;
-                (0, utils_js_1.assert)(fileExports.default);
-                if ((0, utils_js_1.hasProp)(fileExports, 'default', 'string')) {
-                    const routeString = fileExports.default;
-                    (0, utils_js_1.assertUsage)(routeString.startsWith('/'), `A Route String should start with a leading slash '/' but ${filePath} has \`export default '${routeString}'\`. Make sure to \`export default '/${routeString}'\` instead.`);
-                    pageRoutes.push({
-                        pageId,
-                        comesFromV1PageConfig,
-                        routeString,
-                        routeDefinedAtString: filePath,
-                        routeType: 'STRING',
-                    });
-                    return;
-                }
-                if ((0, utils_js_1.hasProp)(fileExports, 'default', 'function')) {
-                    const routeFunction = fileExports.default;
-                    {
-                        const allowKey = 'iKnowThePerformanceRisksOfAsyncRouteFunctions';
-                        if (allowKey in fileExports) {
-                            (0, resolveRouteFunction_js_1.warnDeprecatedAllowKey)();
-                        }
-                    }
-                    pageRoutes.push({
-                        pageId,
-                        comesFromV1PageConfig,
-                        routeFunction,
-                        routeFunctionFilePath: filePath,
-                        routeDefinedAtString: filePath,
-                        routeType: 'FUNCTION',
-                    });
-                    return;
-                }
-                (0, utils_js_1.assertUsage)(false, `The default export of ${filePath} should be a string or a function.`);
-            }
-        });
-    }
-    return pageRoutes;
-}
-function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
-    // V1 Design
-    if (pageConfigs.length > 0) {
-        const hook = (0, getHook_js_1.getHookFromPageConfigGlobal)(pageConfigGlobal, 'onBeforeRoute');
-        return { onBeforeRouteHook: hook, filesystemRoots: null };
-    }
-    // Old design
-    // TO-DO/next-major-release: remove
-    let onBeforeRouteHook = null;
-    const filesystemRoots = [];
-    pageFilesAll
-        .filter((p) => p.fileType === '.page.route' && p.isDefaultPageFile)
-        .forEach(({ filePath, fileExports }) => {
-        (0, utils_js_1.assert)(fileExports);
-        if ('onBeforeRoute' in fileExports) {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(fileExports, 'onBeforeRoute', 'function'), `\`export { onBeforeRoute }\` of ${filePath} should be a function.`);
-            const { onBeforeRoute } = fileExports;
-            const hookName = 'onBeforeRoute';
-            onBeforeRouteHook = {
-                hookFilePath: filePath,
-                hookFn: onBeforeRoute,
-                hookName,
-                hookTimeout: (0, getHook_js_1.getHookTimeoutDefault)(hookName),
-            };
-        }
-        if ('filesystemRoutingRoot' in fileExports) {
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(fileExports, 'filesystemRoutingRoot', 'string'), `\`export { filesystemRoutingRoot }\` of ${filePath} should be a string.`);
-            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(fileExports, 'filesystemRoutingRoot', 'string'), `\`export { filesystemRoutingRoot }\` of ${filePath} is \`'${fileExports.filesystemRoutingRoot}'\` but it should start with a leading slash \`/\`.`);
-            filesystemRoots.push({
-                filesystemRoot: dirname(filePath),
-                urlRoot: fileExports.filesystemRoutingRoot,
-            });
-        }
-    });
-    return { onBeforeRouteHook, filesystemRoots };
-}
-function dirname(filePath) {
-    (0, utils_js_1.assert)(filePath.startsWith('/'));
-    (0, utils_js_1.assert)(!filePath.endsWith('/'));
-    const paths = filePath.split('/');
-    const dirPath = (0, utils_js_1.slice)(paths, 0, -1).join('/') || '/';
-    (0, utils_js_1.assert)(dirPath.startsWith('/'));
-    (0, utils_js_1.assert)(!dirPath.endsWith('/') || dirPath === '/');
-    return dirPath;
-}

package/dist/cjs/shared/route/noRouteMatch.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.noRouteMatch = void 0;
-exports.noRouteMatch = "doesn't match the route of any of your pages";

package/dist/cjs/shared/route/resolvePrecedence.js

@@ -1,93 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePrecedence = resolvePrecedence;
-// export type { RouteMatch }
-const resolveRouteString_js_1 = require("./resolveRouteString.js");
-const utils_js_1 = require("./utils.js");
-const utils_js_2 = require("./utils.js");
-const resolveRouteString_js_2 = require("./resolveRouteString.js");
-// See https://vike.dev/route-function#precedence
-function resolvePrecedence(routeMatches) {
-    // prettier-ignore
-    // biome-ignore format:
-    routeMatches
-        .sort(sortMatches)
-        .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FUNCTION' && !!routeMatch.precedence && routeMatch.precedence < 0))
-        .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'STRING' && (0, resolveRouteString_js_2.isStaticRouteString)(routeMatch.routeString) === false))
-        .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FUNCTION' && !routeMatch.precedence))
-        .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'STRING' && (0, resolveRouteString_js_2.isStaticRouteString)(routeMatch.routeString) === true))
-        .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FILESYSTEM'))
-        .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FUNCTION' && !!routeMatch.precedence && routeMatch.precedence > 0));
-}
-// -1 => routeMatch1 higher precedence
-// +1 => routeMatch2 higher precedence
-function sortMatches(routeMatch1, routeMatch2) {
-    {
-        const precedence1 = routeMatch1.precedence ?? 0;
-        const precedence2 = routeMatch2.precedence ?? 0;
-        if (precedence1 !== precedence2) {
-            return precedence1 > precedence2 ? -1 : 1;
-        }
-    }
-    if (!routeMatch2.routeString) {
-        return 0;
-    }
-    if (!routeMatch1.routeString) {
-        return 0;
-    }
-    /* DEBUG
-    console.log('routeMatch1.routeString', routeMatch1.routeString)
-    console.log('routeMatch2.routeString', routeMatch2.routeString)
-    console.log('parseRouteString(routeMatch1.routeString)', parseRouteString(routeMatch1.routeString))
-    console.log('parseRouteString(routeMatch2.routeString)', parseRouteString(routeMatch2.routeString))
-    //*/
-    // Return route with highest number of static path segments at beginning first
-    {
-        const getValue = (routeString) => (0, resolveRouteString_js_1.analyzeRouteString)(routeString).numberOfStaticPartsBeginning;
-        const result = (0, utils_js_1.higherFirst)(getValue)(routeMatch1.routeString, routeMatch2.routeString);
-        if (result !== 0) {
-            /* DEBUG
-            console.log('analyzeRouteString(routeMatch1.routeString).numberOfStaticPartsBeginning', getValue(routeMatch1.routeString))
-            console.log('analyzeRouteString(routeMatch2.routeString).numberOfStaticPartsBeginning', getValue(routeMatch2.routeString))
-            //*/
-            return result;
-        }
-    }
-    // Return route with highest number of static path segments in total first
-    {
-        const getValue = (routeString) => (0, resolveRouteString_js_1.analyzeRouteString)(routeString).numberOfStaticParts;
-        const result = (0, utils_js_1.higherFirst)(getValue)(routeMatch1.routeString, routeMatch2.routeString);
-        if (result !== 0) {
-            /* DEBUG
-            console.log('analyzeRouteString(routeMatch1.routeString).numberOfStaticParts', getValue(routeMatch1.routeString))
-            console.log('analyzeRouteString(routeMatch2.routeString).numberOfStaticParts', getValue(routeMatch2.routeString))
-            //*/
-            return result;
-        }
-    }
-    // Return route with least amount of globs first
-    {
-        const getValue = (routeString) => (0, resolveRouteString_js_1.analyzeRouteString)(routeString).numberOfGlobs;
-        const result = (0, utils_js_1.lowerFirst)(getValue)(routeMatch1.routeString, routeMatch2.routeString);
-        if (result !== 0) {
-            /* DEBUG
-            console.log('analyzeRouteString(routeMatch1.routeString).numberOfGlobs', getValue(routeMatch1.routeString))
-            console.log('analyzeRouteString(routeMatch2.routeString).numberOfGlobs', getValue(routeMatch2.routeString))
-            //*/
-            return result;
-        }
-    }
-    // Return route with highest number of parameters first
-    {
-        const getValue = (routeString) => (0, resolveRouteString_js_1.analyzeRouteString)(routeString).numberOfParams;
-        const result = (0, utils_js_1.higherFirst)(getValue)(routeMatch1.routeString, routeMatch2.routeString);
-        if (result !== 0) {
-            /* DEBUG
-            console.log('analyzeRouteString(routeMatch1.routeString).numberOfParams', getValue(routeMatch1.routeString))
-            console.log('analyzeRouteString(routeMatch2.routeString).numberOfParams', getValue(routeMatch2.routeString))
-            //*/
-            return result;
-        }
-    }
-    return 0;
-}

package/dist/cjs/shared/route/resolveRoute.js

@@ -1,20 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveRoute = resolveRoute;
-const utils_js_1 = require("./utils.js");
-const resolveRouteString_js_1 = require("./resolveRouteString.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function resolveRoute(routeString, urlPathname) {
-    const errMsg = (propName, msg = 'a non-empty string') => `[resolveRoute(routeString, urlPathname)] ${picocolors_1.default.cyan(propName)} should be ` + msg;
-    (0, utils_js_1.assertUsage)(routeString, errMsg('routeString'), { showStackTrace: true });
-    (0, utils_js_1.assertUsage)(urlPathname, errMsg('urlPathname'), { showStackTrace: true });
-    (0, utils_js_1.assertUsage)(urlPathname.startsWith('/'), errMsg('urlPathname', 'pageContext.urlPathname'), { showStackTrace: true });
-    const result = (0, resolveRouteString_js_1.resolveRouteString)(routeString, urlPathname);
-    return {
-        match: !!result,
-        routeParams: result?.routeParams ?? {},
-    };
-}

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

@@ -1,73 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveRouteFunction = resolveRouteFunction;
-exports.assertRouteParams = assertRouteParams;
-exports.assertSyncRouting = assertSyncRouting;
-exports.warnDeprecatedAllowKey = warnDeprecatedAllowKey;
-const execHook_js_1 = require("../hooks/execHook.js");
-const preparePageContextForPublicUsage_js_1 = require("../preparePageContextForPublicUsage.js");
-const utils_js_1 = require("./utils.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFilePath) {
-    let { hookReturn: result } = (0, execHook_js_1.execHookDirectSync)({
-        hookFn: routeFunction,
-        hookFilePath: routeFunctionFilePath,
-        hookName: 'route',
-    }, pageContext, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage);
-    assertSyncRouting(result, `The Route Function ${routeFunctionFilePath}`);
-    // TO-DO/next-major-release: make resolveRouteFunction() and route() sync
-    //* We disallow asynchronous routing, because we need to check whether a link is a Vike link in a synchronous fashion before calling ev.preventDefault() in the 'click' event listener
-    result = await result;
-    //*/
-    if (result === false) {
-        return null;
-    }
-    if (result === true) {
-        result = {};
-    }
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isPlainObject)(result), `The Route Function ${routeFunctionFilePath} should return a boolean or a plain JavaScript object (but it's ${picocolors_1.default.cyan(`typeof result === ${JSON.stringify(typeof result)}`)} instead)`);
-    // AFAICT this return interface is superfluous. Should we soft-deprecate it and remove it?
-    if ('match' in result) {
-        const { match } = result;
-        (0, utils_js_1.assertUsage)(typeof match === 'boolean', `The ${picocolors_1.default.cyan('match')} value returned by the Route Function ${routeFunctionFilePath} should be a boolean.`);
-        if (!match) {
-            return null;
-        }
-    }
-    let precedence = null;
-    if ('precedence' in result) {
-        precedence = result.precedence;
-        (0, utils_js_1.assertUsage)(typeof precedence === 'number', `The ${picocolors_1.default.cyan('precedence')} value returned by the Route Function ${routeFunctionFilePath} should be a number.`);
-    }
-    assertRouteParams(result, `The ${picocolors_1.default.cyan('routeParams')} object returned by the Route Function ${routeFunctionFilePath} should`);
-    const routeParams = result.routeParams || {};
-    (0, utils_js_1.assertUsage)(!('pageContext' in result), `Providing ${picocolors_1.default.cyan('pageContext')} in Route Functions is prohibited, see https://vike.dev/route-function#cannot-provide-pagecontext`);
-    (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(routeParams));
-    Object.keys(result).forEach((key) => {
-        (0, utils_js_1.assertUsage)(key === 'match' || key === 'routeParams' || key === 'precedence', `The Route Function ${routeFunctionFilePath} returned an object with an unknown property ${picocolors_1.default.cyan(key)} (the known properties are ${picocolors_1.default.cyan('match')}, ${picocolors_1.default.cyan('routeParams')}, and ${picocolors_1.default.cyan('precedence')})`);
-    });
-    return {
-        precedence,
-        routeParams,
-    };
-}
-// TO-DO/next-major-release: remove, and make routing synchronous (enabling Vike to synchronously check whether a link is a Vike link before even calling ev.preventDefault())
-function assertSyncRouting(res, errPrefix) {
-    (0, utils_js_1.assertWarning)(!(0, utils_js_1.isPromise)(res), `${errPrefix} returned a promise, but asynchronous routing is deprecated and will be removed in the next major release, see https://vike.dev/route-function#async`, { onlyOnce: true });
-}
-// TO-DO/next-major-release: remove
-function warnDeprecatedAllowKey() {
-    const allowKey = picocolors_1.default.cyan('iKnowThePerformanceRisksOfAsyncRouteFunctions');
-    (0, utils_js_1.assertWarning)(false, `${allowKey} is deprecated and will be removed in the next major release`, { onlyOnce: true });
-}
-function assertRouteParams(result, errPrefix) {
-    (0, utils_js_1.assert)(errPrefix.endsWith(' should'));
-    if (!(0, utils_js_1.hasProp)(result, 'routeParams')) {
-        return;
-    }
-    (0, utils_js_1.assert)(errPrefix.endsWith(' should'));
-    (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(result, 'routeParams', 'string{}'), `${errPrefix} be an object holding string values.`);
-}