@gracile/engine 0.7.0-next.0 → 0.7.0-next.1

package/dist/plugin.js

@@ -1,5 +1,7 @@
 import { join } from 'node:path';
-import { logger } from '@gracile/internal-utils/logger';
+import { createLogger } from '@gracile/internal-utils/logger/helpers';
+import { getVersion } from '@gracile/internal-utils/version';
+import { betterErrors } from '@gracile-labs/better-errors/plugin';
 import { rename, rm } from 'fs/promises';
 import c from 'picocolors';
 import { build, createServer } from 'vite';
@@ -31,6 +33,7 @@ let isClientBuilt = false;
 // This `any[]` AND with a plugin -array- makes ESLint and TS shut up.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const gracile = (config) => {
+    const logger = createLogger();
     const outputMode = config?.output || 'static';
     const clientAssets = {};
     const routes = new Map();
@@ -49,6 +52,9 @@ export const gracile = (config) => {
         // enabled: gracileConfig?.pages?.premises?.expose || false,
     });
     return [
+        betterErrors({
+            overlayImportPath: '@gracile/gracile/_internals/vite-custom-overlay',
+        }),
         // 		{
         // 			name: 'gracile-routes-codegen',
         // 			// watchChange(change) {
@@ -74,14 +80,19 @@ export const gracile = (config) => {
         // 				return null;
         // 			},
         // 		},
-        virtualRoutesForClient,
         {
             name: 'vite-plugin-gracile-serve-middleware',
             apply: 'serve',
-            config() {
+            config(_, env) {
+                if (env.isPreview)
+                    return null;
                 return {
                     // NOTE: Supresses message: `Could not auto-determine entry point from rollupOptions or html files…`
+                    // FIXME: It's not working when reloading the Vite config.
+                    // Is user config, putting `optimizeDeps: { include: [] }` solve this.
                     optimizeDeps: { include: [] },
+                    // NOTE: Useful? It breaks preview (expected)
+                    appType: 'custom',
                     // resolve: {
                     // 	conditions: ['development'],
                     // },
@@ -102,7 +113,7 @@ export const gracile = (config) => {
                 // ) as {
                 // 	version: number;
                 // };
-                const version = process.env['__GRACILE_VERSION__'];
+                const version = getVersion();
                 logger.info(`${c.cyan(c.italic(c.underline('🧚 Gracile')))}` +
                     ` ${c.dim(`~`)} ${c.green(`v${version ?? 'X'}`)}`);
                 // ---
@@ -111,14 +122,28 @@ export const gracile = (config) => {
                     vite: server,
                     gracileConfig,
                 });
+                logger.info(c.dim('Vite development server is starting…'), {
+                    timestamp: true,
+                });
+                server.watcher.on('ready', () => {
+                    setTimeout(() => {
+                        logger.info('');
+                        logger.info(c.green('Watching for file changes…'), {
+                            timestamp: true,
+                        });
+                        logger.info('');
+                    }, 100);
+                    // s
+                });
                 return () => {
                     server.middlewares.use((req, res, next) => {
                         const locals = config?.dev?.locals?.({ nodeRequest: req });
-                        Promise.resolve(nodeAdapter(handler)(req, res, locals)).catch((error) => next(error));
+                        Promise.resolve(nodeAdapter(handler, { logger })(req, res, locals)).catch((error) => next(error));
                     });
                 };
             },
         },
+        virtualRoutesForClient,
         {
             name: 'vite-plugin-gracile-build',
             apply: 'build',
@@ -224,6 +249,9 @@ export const gracile = (config) => {
                                     return `
 import { routeAssets, routeImports, routes } from 'gracile:routes';
 import { createGracileHandler } from '@gracile/gracile/_internals/server-runtime';
+import { createLogger } from '@gracile/gracile/_internals/logger';
+
+createLogger();
 
 export const handler = createGracileHandler({
 	root: process.cwd(),

package/dist/render/route-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-template.d.ts","sourceRoot":"","sources":["../../src/render/route-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,KAAK,CAAC,MAAM,oBAAoB,CAAC;AAa7C,eAAO,MAAM,gBAAgB,QACkC,CAAC;AAEhE,eAAO,MAAM,cAAc,QAA2B,CAAC;AAEvD,wBAAsB,mBAAmB,CAAC,EACzC,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,WAAW,EACX,UAAU,EACV,OAAO,GACP,EAAE;IACF,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,SAAS,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,MAAM,CAAA;CAAE,CAAC,CAwLhE"}
+{"version":3,"file":"route-template.d.ts","sourceRoot":"","sources":["../../src/render/route-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAO1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,KAAK,CAAC,MAAM,oBAAoB,CAAC;AAa7C,eAAO,MAAM,gBAAgB,QACkC,CAAC;AAEhE,eAAO,MAAM,cAAc,QAA2B,CAAC;AAEvD,wBAAsB,mBAAmB,CAAC,EACzC,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,WAAW,EACX,UAAU,EACV,OAAO,GACP,EAAE;IACF,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,SAAS,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,MAAM,CAAA;CAAE,CAAC,CAqNhE"}

package/dist/render/route-template.js

@@ -1,8 +1,9 @@
 import { Readable } from 'node:stream';
+import * as assert from '@gracile/internal-utils/assertions';
 import { html } from '@gracile/internal-utils/dummy-literals';
 import { render as renderLitSsr } from '@lit-labs/ssr';
 import { collectResult } from '@lit-labs/ssr/lib/render-result.js';
-import { isLitServerTemplate, isLitTemplate } from '../assertions.js';
+import { GracileError, GracileErrorData, TemplateError, } from '../errors/errors.js';
 import { PAGE_ASSETS_MARKER, SSR_OUTLET_MARKER } from './markers.js';
 async function* concatStreams(...readables) {
     // eslint-disable-next-line no-restricted-syntax
@@ -16,6 +17,9 @@ async function* concatStreams(...readables) {
 export const REGEX_TAG_SCRIPT = /\s?<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script\s*>\s?/gi;
 export const REGEX_TAG_LINK = /\s?<link\b[^>]*?>\s?/gi;
 export async function renderRouteTemplate({ url, vite, mode, routeInfos, routeAssets, serverMode, docOnly, }) {
+    const location = {
+        file: routeInfos.foundRoute.filePath,
+    };
     if (!routeInfos.routeModule.document && !routeInfos.routeModule.template)
         return { output: null, document: null };
     // MARK: Context
@@ -27,8 +31,12 @@ export async function renderRouteTemplate({ url, vite, mode, routeInfos, routeAs
     // MARK: Fragment
     if (!routeInfos.routeModule.document && routeInfos.routeModule.template) {
         const fragmentOutput = await Promise.resolve(routeInfos.routeModule.template?.(context));
-        if (isLitTemplate(fragmentOutput) === false)
-            throw Error(`Wrong template result for fragment template ${routeInfos.foundRoute.filePath}.`);
+        if (assert.isLitTemplate(fragmentOutput) === false)
+            throw new GracileError({
+                ...GracileErrorData.InvalidRouteDocument,
+                message: GracileErrorData.InvalidRouteDocument.message(location.file),
+                // location,
+            });
         const fragmentRender = renderLitSsr(fragmentOutput);
         const output = Readable.from(fragmentRender);
         return { output, document: null };
@@ -36,11 +44,30 @@ export async function renderRouteTemplate({ url, vite, mode, routeInfos, routeAs
     // MARK: Document
     if (!routeInfos.routeModule.document ||
         typeof routeInfos.routeModule.document !== 'function')
-        throw new TypeError(`Route document must be a function ${routeInfos.foundRoute.filePath}.`);
+        throw new GracileError({
+            ...GracileErrorData.InvalidRouteDocument,
+            message: GracileErrorData.InvalidRouteDocument.message(location.file),
+            location,
+        });
     const baseDocTemplateResult = await Promise.resolve(routeInfos.routeModule.document?.(context));
-    if (isLitServerTemplate(baseDocTemplateResult) === false)
-        throw new TypeError(`Incorrect document template result for ${routeInfos.foundRoute.filePath}.`);
-    const baseDocRendered = await collectResult(renderLitSsr(baseDocTemplateResult));
+    if (assert.isLitServerTemplate(baseDocTemplateResult) === false)
+        throw new GracileError({
+            ...GracileErrorData.InvalidRouteDocumentResult,
+            message: GracileErrorData.InvalidRouteDocumentResult.message(location.file),
+            location,
+        });
+    let baseDocRendered;
+    // console.log({ ddd: baseDocTemplateResult });
+    try {
+        baseDocRendered = await collectResult(renderLitSsr(baseDocTemplateResult));
+    }
+    catch (e) {
+        throw new TemplateError({
+            ...GracileErrorData.CouldNotRenderRouteDocument,
+            message: GracileErrorData.CouldNotRenderRouteDocument.message(location.file),
+            location,
+        }, { cause: String(e) });
+    }
     // MARK: Sibling assets
     let baseDocRenderedWithAssets = baseDocRendered;
     // If the user doesnt use `pageAssetCustomLocation`, we put this as a fallback
@@ -62,7 +89,8 @@ export async function renderRouteTemplate({ url, vite, mode, routeInfos, routeAs
                         // prettier-ignore
                         return html `		<link rel="stylesheet" href="/${path}" />`;
                     }
-                    throw new Error('Unknown asset.');
+                    // NOTE: Never called (filtered upstream in `collectRoutes`)
+                    return null;
                 })
                     .join('\n')}` +
                 `<!-- /PAGE ASSETS -->\n		`
@@ -128,7 +156,7 @@ export async function renderRouteTemplate({ url, vite, mode, routeInfos, routeAs
         // 	);
         // 	return { output, document: null };
         // }
-        if (isLitTemplate(routeOutput) === false)
+        if (assert.isLitTemplate(routeOutput) === false)
             throw Error(`Wrong template result for page template ${routeInfos.foundRoute.filePath}.`);
         const renderStream = Readable.from(renderLitSsr(routeOutput));
         const output = Readable.from(concatStreams(baseDocRenderStreamPre, renderStream, baseDocRenderStreamPost));

package/dist/routes/collect.d.ts

@@ -1,3 +1,4 @@
 import type * as R from './route.js';
-export declare function collectRoutes(routes: R.RoutesManifest, root: string, excludePatterns?: string[]): Promise<R.RoutesManifest>;
+export declare const WATCHED_FILES_REGEX: RegExp;
+export declare function collectRoutes(routes: R.RoutesManifest, root: string, excludePatterns?: string[]): Promise<void>;
 //# sourceMappingURL=collect.d.ts.map

package/dist/routes/collect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collect.d.ts","sourceRoot":"","sources":["../../src/routes/collect.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,KAAK,CAAC,MAAM,YAAY,CAAC;AA4DrC,wBAAsB,aAAa,CAClC,MAAM,EAAE,CAAC,CAAC,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,eAAe,GAAE,MAAM,EAAO,GAE5B,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CA+F3B"}
+{"version":3,"file":"collect.d.ts","sourceRoot":"","sources":["../../src/routes/collect.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,KAAK,CAAC,MAAM,YAAY,CAAC;AAuDrC,eAAO,MAAM,mBAAmB,QAC+B,CAAC;AAGhE,wBAAsB,aAAa,CAClC,MAAM,EAAE,CAAC,CAAC,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,eAAe,GAAE,MAAM,EAAO,GAE5B,OAAO,CAAC,IAAI,CAAC,CAoGf"}

package/dist/routes/collect.js

@@ -1,19 +1,20 @@
 import { join } from 'node:path';
-import { logger } from '@gracile/internal-utils/logger';
+import { getLogger } from '@gracile/internal-utils/logger/helpers';
 import * as paths from '@gracile/internal-utils/paths';
 import { fdir as Fdir } from 'fdir';
 import c from 'picocolors';
 import { URLPattern } from 'urlpattern-polyfill/urlpattern';
 import { createFilter } from 'vite';
-// import type { ViteDevServer } from 'vite';
+import { emptyRoutes } from '../logging/messages.js';
 import { prepareSortableRoutes, routeComparator } from './comparator.js';
 import { REGEXES } from './load-module.js';
+const logger = getLogger();
 function extractRoutePatterns(routeFilePath) {
     const routePathname = routeFilePath.replace(/\.[j|t]s$/, '');
-    let pathParts = routePathname.split(process.platform === 'win32' ? '\\' : '/');
+    let pathParts = routePathname.split(paths.isWindows() ? paths.WINDOWS_PATH_SEPARATOR : '/');
     const last = pathParts.at(-1);
-    if (typeof last === 'undefined')
-        throw new TypeError('Cannot parse file path.');
+    if (last === undefined)
+        throw new ReferenceError('Cannot parse file path.');
     if (
     // NOTE: /foo/(foo) => /foo
     /\((.*)\)/.test(last) ||
@@ -22,9 +23,6 @@ function extractRoutePatterns(routeFilePath) {
         pathParts.pop();
     if (pathParts.length === 1 && pathParts.at(0) === 'index')
         pathParts = [];
-    // NOTE: Disabled for now, but might be useful later
-    // if (pathParts.length === 1 && pathParts.at(0) === '404')
-    // 	pathParts = ['__404'];
     let hasParams = false;
     const pathRelNorm = pathParts.map((pathEntry) => {
         let entry = pathEntry;
@@ -48,6 +46,7 @@ function extractRoutePatterns(routeFilePath) {
         hasParams,
     };
 }
+export const WATCHED_FILES_REGEX = /\/src\/routes\/(.*)\.(ts|js|css|scss|sass|less|styl|stylus)$/;
 // const routes: R.RoutesManifest = new Map<string, R.Route>();
 export async function collectRoutes(routes, root /* vite: ViteDevServer */, excludePatterns = []) {
     routes.clear();
@@ -69,6 +68,12 @@ export async function collectRoutes(routes, root /* vite: ViteDevServer */, excl
         ...excludePatterns,
     ]);
     const serverEntrypoints = allFilesInRoutes.filter((f) => serverEntrypointsFilter(f));
+    if (serverEntrypoints.length === 0) {
+        logger.warnOnce(emptyRoutes(), {
+            timestamp: true,
+        });
+        return;
+    }
     // MARK: Routes priority order
     // TODO: `prepareSortableRoutes` and `routeComparator` in same function `sortRoutes`
     const serverEntrypointsSorted = prepareSortableRoutes(serverEntrypoints)
@@ -117,5 +122,4 @@ export async function collectRoutes(routes, root /* vite: ViteDevServer */, excl
                 route.pageAssets.push(assetPathWithExt);
         });
     });
-    return routes;
 }

package/dist/routes/load-module.d.ts

@@ -1,4 +1,4 @@
-import type { ViteDevServer } from 'vite';
+import { type ViteDevServer } from 'vite';
 import * as R from './route.js';
 export declare const REGEXES: {
     param: RegExp;

package/dist/routes/load-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-module.d.ts","sourceRoot":"","sources":["../../src/routes/load-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAGhC,eAAO,MAAM,OAAO;;;;;;CASnB,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,EAC5C,IAAI,EACJ,KAAK,EACL,YAAY,GACZ,EAAE;IACF,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC;CAC3C,0BA2BA"}
+{"version":3,"file":"load-module.d.ts","sourceRoot":"","sources":["../../src/routes/load-module.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAGhC,eAAO,MAAM,OAAO;;;;;;CASnB,CAAC;AAQF,wBAAsB,sBAAsB,CAAC,EAC5C,IAAI,EACJ,KAAK,EACL,YAAY,GACZ,EAAE;IACF,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC;CAC3C,0BA8CA"}

package/dist/routes/load-module.js

@@ -1,3 +1,9 @@
+import { collectErrorMetadata } from '@gracile-labs/better-errors/dev/utils';
+import { enhanceViteSSRError } from '@gracile-labs/better-errors/dev/vite';
+import { join } from 'path';
+import { pathToFileURL } from 'url';
+import {} from 'vite';
+import { GracileError, GracileErrorData } from '../errors/errors.js';
 import * as R from './route.js';
 // const ROUTE_SPREAD = /^\.{3}.+$/;
 export const REGEXES = {
@@ -9,11 +15,32 @@ export const REGEXES = {
     // index: /^(index\.(js|ts)|\((.*)\)\.(js|ts))$/,
     index: /\((.*)\)/,
 };
+const incorrectRouteModuleError = (p) => new GracileError({
+    ...GracileErrorData.InvalidRouteExport,
+    message: GracileErrorData.InvalidRouteExport.message(p),
+});
 export async function loadForeignRouteObject({ vite, route, routeImports, }) {
     // NOTE: Check and assert unknown userland module to correct RouteModule instance (in the engine's realm)
     let unknownRouteModule = null;
-    if (vite)
-        unknownRouteModule = await vite.ssrLoadModule(route.filePath);
+    if (vite) {
+        try {
+            unknownRouteModule = await vite.ssrLoadModule(route.filePath /* + 's' */, {});
+        }
+        catch (e) {
+            const err = e;
+            const filePath = pathToFileURL(join(vite.config.root, route.filePath));
+            const rootFolder = pathToFileURL(vite.config.root);
+            // NOTE: Maybe it's not required here? But just upstream (safeError…)
+            const enhance = enhanceViteSSRError({
+                error: err,
+                filePath,
+                // @ts-expect-error Typings mismatches
+                vite,
+            });
+            const errorWithMetadata = collectErrorMetadata(enhance, rootFolder);
+            throw errorWithMetadata;
+        }
+    }
     else if (routeImports) {
         const ri = routeImports.get(route.pattern.pathname);
         if (ri)
@@ -22,11 +49,10 @@ export async function loadForeignRouteObject({ vite, route, routeImports, }) {
     if (unknownRouteModule === null)
         throw new Error('Cannot find route module.');
     const routeModuleFactory = unknownRouteModule['default'];
-    const errorBase = `Incorrect route module ${route.filePath}!`;
     if (typeof routeModuleFactory !== 'function')
-        throw new TypeError(`${errorBase} Not a function.`);
+        throw incorrectRouteModuleError(route.filePath);
     const routeModule = routeModuleFactory(R.RouteModule);
     if (routeModule instanceof R.RouteModule === false)
-        throw new TypeError(`${errorBase} Not a RouteModule.`);
+        throw incorrectRouteModuleError(route.filePath);
     return routeModule;
 }

package/dist/routes/match.d.ts

@@ -13,6 +13,6 @@ export declare function getRoute(options: {
     vite?: ViteDevServer | undefined;
     routes: R.RoutesManifest;
     routeImports?: R.RoutesImports | undefined;
-}): Promise<RouteInfos>;
+}): Promise<RouteInfos | null>;
 export {};
 //# sourceMappingURL=match.d.ts.map

package/dist/routes/match.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../src/routes/match.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,KAAK,CAAC,MAAM,YAAY,CAAC;AAErC,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;AAoFjD,MAAM,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACrC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,wBAAsB,QAAQ,CAAC,OAAO,EAAE;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC;CAC3C,GAAG,OAAO,CAAC,UAAU,CAAC,CA2BtB"}
+{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../src/routes/match.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,KAAK,CAAC,MAAM,YAAY,CAAC;AAErC,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;AAoFjD,MAAM,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACrC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,wBAAsB,QAAQ,CAAC,OAAO,EAAE;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC;CAC3C,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAiC7B"}

package/dist/routes/match.js

@@ -15,7 +15,7 @@ function matchRouteFromUrl(url, routes) {
         }
     }
     if (!match || !foundRoute)
-        throw new Error(`No route matching for ${url}`, { cause: 404 });
+        return null;
     const params = Object.freeze({ ...match.pathname.groups });
     return { match, foundRoute, params, pathname };
 }
@@ -38,24 +38,38 @@ async function extractStaticPaths(options) {
         }
     });
     if (hasCorrectParams === false)
-        throw new Error(`Incorrect route parameters for \`${options.pathname}\`.\n` +
-            `Check \`staticPaths\` for \`${options.foundRoute.filePath}\`.`);
+        // throw new Error(
+        // 	`Incorrect route parameters for \`${options.pathname}\`.\n` +
+        // 		`Check \`staticPaths\` for \`${options.foundRoute.filePath}\`.`,
+        // );
+        return null;
     return { staticPaths, props };
 }
 export async function getRoute(options) {
-    const { foundRoute, pathname, params } = matchRouteFromUrl(options.url, options.routes);
+    // throw new GracileError(new Error(`No route matching for ${url}`), {
+    // 	cause: 404,
+    // });
+    const matchedRoute = matchRouteFromUrl(options.url, options.routes);
+    if (!matchedRoute)
+        return matchedRoute;
+    const { foundRoute, pathname, params } = matchedRoute;
     // TODO: Simplify all the routes things
     const routeModule = await loadForeignRouteObject({
         vite: options.vite,
         route: foundRoute,
         routeImports: options.routeImports,
     });
-    const staticPaths = await extractStaticPaths({
-        routeModule,
-        foundRoute,
-        pathname,
-        params,
-    });
+    let staticPaths = null;
+    if (routeModule.staticPaths) {
+        staticPaths = await extractStaticPaths({
+            routeModule,
+            foundRoute,
+            pathname,
+            params,
+        });
+        if (!staticPaths)
+            return null;
+    }
     return {
         params,
         props: staticPaths?.props,

package/dist/routes/route.d.ts

@@ -24,7 +24,7 @@ export declare class RouteModule {
     #private;
     get staticPaths(): StaticPathsGeneric | undefined;
     get locals(): {};
-    get handler(): Handler<object | Response | undefined> | Partial<Record<MethodHtml, Handler<object | Response | undefined>> & Record<MethodNonHtml, Handler<Response>>> | undefined;
+    get handler(): HandlerGeneric | undefined;
     get document(): DocumentTemplate<RouteContextGeneric> | undefined;
     get prerender(): boolean | undefined;
     get template(): ((context: RouteContextGeneric) => RouteTemplateResult) | undefined;

package/dist/routes/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/routes/route.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/routes/route.ts"],"names":[],"mappings":"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"}

package/dist/routes/route.js

@@ -36,18 +36,20 @@ export class RouteModule {
         return this.#template;
     }
     constructor(options) {
-        if (typeof options.staticPaths === 'function')
-            this.#staticPaths = options.staticPaths;
-        if ((typeof options.handler === 'object' ||
-            typeof options.handler === 'function') &&
-            options.handler)
-            this.#handler = options.handler;
+        // if (typeof options.staticPaths === 'function')
+        this.#staticPaths = options.staticPaths;
+        // if (
+        // 	(typeof options.handler === 'object' ||
+        // 		typeof options.handler === 'function') &&
+        // 	options.handler
+        // )
+        this.#handler = options.handler;
         this.#locals = {};
-        if (typeof options.template === 'function')
-            this.#template = options.template;
-        if (typeof options.document === 'function')
-            this.#document = options.document;
-        if (typeof options.prerender === 'boolean')
-            this.#prerender = options.prerender;
+        // if (typeof options.template === 'function')
+        this.#template = options.template;
+        // if (typeof options.document === 'function')
+        this.#document = options.document;
+        // if (typeof options.prerender === 'boolean')
+        this.#prerender = options.prerender;
     }
 }

package/dist/server/adapters/hono.d.ts

@@ -1,4 +1,4 @@
-import type { GracileHandler } from '../request.js';
+import type { AdapterOptions, GracileHandler } from '../request.js';
 export type { GracileHandler };
 export type GracileHonoHandler = (context: {
     req: {
@@ -6,8 +6,11 @@ export type GracileHonoHandler = (context: {
     };
     var: unknown;
 }) => Promise<Response>;
+export interface HonoAdapterOptions extends AdapterOptions {
+}
 /**
  * @param handler - Takes a pre-built Gracile handler from `./dist/server/entrypoint.js`.
+ * @param options - If you need more control.
  * @example
  * `/src/server.js`
  * ```js
@@ -25,7 +28,7 @@ export type GracileHonoHandler = (context: {
  * serve(app);
  * ```
  */
-export declare const honoAdapter: (handler: GracileHandler) => GracileHonoHandler;
+export declare const honoAdapter: (handler: GracileHandler, options?: HonoAdapterOptions) => GracileHonoHandler;
 /**
  *
  * @param root - resolve `dist/client` from this file path.

package/dist/server/adapters/hono.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hono.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/hono.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE;IAC1C,GAAG,EAAE;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;CACb,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAExB;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,YACb,cAAc,KAAG,kBAc1B,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,UAK7C;AAED,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"hono.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/hono.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE;IAC1C,GAAG,EAAE;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;CACb,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAExB,MAAM,WAAW,kBAAmB,SAAQ,cAAc;CAEzD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,WAAW,YACb,cAAc,YAAY,kBAAkB,KAAG,kBAmBxD,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,UAK7C;AAED,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}

package/dist/server/adapters/hono.js

@@ -1,10 +1,12 @@
-// import { logger } from '@gracile/internal-utils/logger';
 import { relative } from 'node:path';
 import { Readable } from 'node:stream';
 import { fileURLToPath } from 'node:url';
+import { createLogger } from '@gracile/internal-utils/logger/helpers';
+import { GracileError, GracileErrorData } from '../../errors/errors.js';
 import { constants } from '../constants.js';
 /**
  * @param handler - Takes a pre-built Gracile handler from `./dist/server/entrypoint.js`.
+ * @param options - If you need more control.
  * @example
  * `/src/server.js`
  * ```js
@@ -22,7 +24,8 @@ import { constants } from '../constants.js';
  * serve(app);
  * ```
  */
-export const honoAdapter = (handler) => async (context) => {
+export const honoAdapter = (handler, options) => async (context) => {
+    createLogger(options?.logger);
     const result = await handler(context.req.raw, context.var);
     // TODO: Handle stream abortion as gracefully as with Express.
     if (result?.body) {
@@ -32,7 +35,10 @@ export const honoAdapter = (handler) => async (context) => {
     }
     if (result?.response)
         return result.response;
-    throw new Error('Rendering was impossible in the Hono adapter!');
+    throw new GracileError({
+        ...GracileErrorData.InvalidResponseInAdapter,
+        message: GracileErrorData.InvalidResponseInAdapter.message('Hono'),
+    });
 };
 /**
  *

package/dist/server/adapters/node.d.ts

@@ -1,7 +1,9 @@
 import type { IncomingMessage, ServerResponse } from 'http';
-import { type GracileHandler } from '../request.js';
+import { type AdapterOptions, type GracileHandler } from '../request.js';
 export type { GracileHandler };
 export type GracileNodeHandler = (req: IncomingMessage, res: ServerResponse, locals?: unknown) => Promise<ServerResponse<IncomingMessage> | null | void>;
+export interface NodeAdapterOptions extends AdapterOptions {
+}
 /**
  * @param handler - Takes a pre-built Gracile handler from `./dist/server/entrypoint.js`.
  * @example
@@ -20,7 +22,7 @@ export type GracileNodeHandler = (req: IncomingMessage, res: ServerResponse, loc
  * const server = app.listen();
  * ```
  */
-export declare function nodeAdapter(handler: GracileHandler): GracileNodeHandler;
+export declare function nodeAdapter(handler: GracileHandler, options?: NodeAdapterOptions): GracileNodeHandler;
 /**
  * @param root - resolve `dist/client` from this file path.
  * @example

package/dist/server/adapters/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/node.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAG5D,OAAO,EAAE,KAAK,cAAc,EAAc,MAAM,eAAe,CAAC;AAoBhE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,MAAM,kBAAkB,GAAG,CAChC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,MAAM,CAAC,EAAE,OAAO,KAEZ,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAE5D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,kBAAkB,CAkDvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,UAE7C;AAED,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/node.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EACN,KAAK,cAAc,EACnB,KAAK,cAAc,EAEnB,MAAM,eAAe,CAAC;AAoBvB,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,MAAM,MAAM,kBAAkB,GAAG,CAChC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,MAAM,CAAC,EAAE,OAAO,KAEZ,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAE5D,MAAM,WAAW,kBAAmB,SAAQ,cAAc;CAEzD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,WAAW,CAC1B,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,kBAAkB,GAC1B,kBAAkB,CAoEpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,UAE7C;AAED,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}

package/dist/server/adapters/node.js

@@ -1,10 +1,11 @@
 import { Writable } from 'node:stream';
 import { fileURLToPath } from 'node:url';
 import { env } from '@gracile/internal-utils/env';
-import { logger } from '@gracile/internal-utils/logger';
+import { createLogger } from '@gracile/internal-utils/logger/helpers';
 import { createServerAdapter } from '@whatwg-node/server';
+import { GracileError, GracileErrorData } from '../../errors/errors.js';
 import { constants } from '../constants.js';
-import { isRedirect } from '../request.js';
+import { isRedirect, } from '../request.js';
 // NOTE: Find a more canonical way to ponyfill the Node HTTP request to standard Request
 // @ts-expect-error Abusing this feature!
 const nodeRequestToStandardRequest = createServerAdapter((request) => request);
@@ -36,16 +37,28 @@ function standardResponseInitToNodeResponse(responseInit, res) {
  * const server = app.listen();
  * ```
  */
-export function nodeAdapter(handler) {
+export function nodeAdapter(handler, options) {
     return async function nodeHandler(req, res, locals) {
-        const request = (await Promise.resolve(nodeRequestToStandardRequest.handleNodeRequest(
-        // HACK: Incorrect typings
-        req)));
+        const logger = createLogger(options?.logger);
+        let webRequest;
+        try {
+            webRequest = (await Promise.resolve(nodeRequestToStandardRequest.handleNodeRequest(
+            // HACK: Exact optional properties
+            req)));
+        }
+        catch (e) {
+            throw new GracileError({
+                ...GracileErrorData.InvalidRequestInAdapter,
+                message: GracileErrorData.InvalidRequestInAdapter.message('Node'),
+            }, {
+                cause: e,
+            });
+        }
         const mergedLocals = {
             ...(locals ?? {}),
             ...('locals' in res && typeof res.locals === 'object' ? res.locals : {}),
         };
-        const result = await handler(request, mergedLocals);
+        const result = await handler(webRequest, mergedLocals);
         if (result?.body) {
             standardResponseInitToNodeResponse(result.init, res);
             // NOTE: We can't do similar thing with Hono with just
@@ -70,9 +83,11 @@ export function nodeAdapter(handler) {
                     .catch((e) => logger.error(String(e)));
                 return piped;
             }
-            return null;
         }
-        return null;
+        throw new GracileError({
+            ...GracileErrorData.InvalidResponseInAdapter,
+            message: GracileErrorData.InvalidResponseInAdapter.message('Node'),
+        });
     };
 }
 /**