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

package/dist/build/static.d.ts

@@ -1,19 +1,25 @@
 import type { ViteDevServer } from 'vite';
+import type { RoutesManifest } from '../routes/route.js';
 import type { GracileConfig } from '../user-config.js';
 export interface RenderedRouteDefinition {
     absoluteId: string;
     name: string;
     html: string | null;
     handlerAssets?: string;
+    static: {
+        props: unknown;
+        document: string | null;
+    };
     savePrerender: boolean | null;
 }
-export declare function renderRoutes({ vite, serverMode, root, gracileConfig, }: {
+export declare function renderRoutes({ routes, vite, serverMode, root, gracileConfig, }: {
+    routes: RoutesManifest;
     vite: ViteDevServer;
     serverMode: boolean;
     root?: string;
     gracileConfig: GracileConfig;
 }): Promise<{
-    routes: import("../routes/route.js").RoutesManifest;
+    routes: RoutesManifest;
     renderedRoutes: RenderedRouteDefinition[];
 }>;
 //# sourceMappingURL=static.d.ts.map

package/dist/build/static.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../src/build/static.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAK1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,WAAW,uBAAuB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,aAAa,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAeD,wBAAsB,YAAY,CAAC,EAClC,IAAI,EACJ,UAAU,EACV,IAAoB,EACpB,aAAa,GACb,EAAE;IACF,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,aAAa,CAAC;CAC7B;;;GAyHA"}
+{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../src/build/static.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAK1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,WAAW,uBAAuB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,MAAM,EAAE;QACP,KAAK,EAAE,OAAO,CAAC;QACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;KACxB,CAAC;IAEF,aAAa,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAeD,wBAAsB,YAAY,CAAC,EAClC,MAAM,EACN,IAAI,EACJ,UAAU,EACV,IAAoB,EACpB,aAAa,GACb,EAAE;IACF,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,aAAa,CAAC;CAC7B;;;GAmJA"}

package/dist/build/static.js

@@ -17,10 +17,10 @@ async function streamToString(stream) {
     }
     return Buffer.concat(chunks).toString('utf-8');
 }
-export async function renderRoutes({ vite, serverMode, root = process.cwd(), gracileConfig, }) {
+export async function renderRoutes({ routes, vite, serverMode, root = process.cwd(), gracileConfig, }) {
     logger.info(c.green('Rendering routes…'), { timestamp: true });
     // MARK: Collect
-    const routes = await collectRoutes(root, gracileConfig.routes?.exclude);
+    await collectRoutes(routes, root, gracileConfig.routes?.exclude);
     const renderedRoutes = [];
     // MARK: Iterate modules
     await Promise.all([...routes].map(async ([patternString, route]) => {
@@ -31,15 +31,38 @@ export async function renderRoutes({ vite, serverMode, root = process.cwd(), gra
         // NOTE: Skip rendering base document for server
         if (serverMode && typeof routeModule.document !== 'function')
             return;
-        const routeStaticPaths = routeModule.staticPaths?.();
+        const routeStaticPaths = await Promise.resolve(routeModule.staticPaths?.());
         // MARK: Extract data
-        await Promise.all((routeStaticPaths ?? [patternString]).map(async (staticPathOptions) => {
+        await Promise.all(
+        /* Single route */
+        (routeStaticPaths ?? [patternString]).map(async (staticPathOptions) => {
             let pathnameWithParams = patternString;
             let params = {};
             let props;
+            // MARK: Handler data (for single route only, NOT dynamic)
+            if (routeModule.handler) {
+                const url = new URL(pathnameWithParams, 'http://gracile-static');
+                const context = {
+                    url,
+                    params: {},
+                    // NOTE: STUB, maybe it should be better to remove them from typings?
+                    // But that will make more mismatches between static and server.
+                    request: new Request(url),
+                    locals: {},
+                    responseInit: {},
+                };
+                if (typeof routeModule.handler === 'function') {
+                    props = await Promise.resolve(routeModule.handler(context));
+                }
+                else if ('GET' in routeModule.handler) {
+                    props = {
+                        GET: await Promise.resolve(routeModule.handler.GET(context)),
+                    };
+                }
+            }
             // MARK: Convert pattern
             // to real route with static parameters + get props. for after
-            if (typeof staticPathOptions === 'object') {
+            else if (typeof staticPathOptions === 'object') {
                 params = staticPathOptions.params;
                 props = staticPathOptions.props;
                 Object.entries(staticPathOptions.params).forEach(([paramName, value]) => {
@@ -62,9 +85,10 @@ export async function renderRoutes({ vite, serverMode, root = process.cwd(), gra
                 name = '404.html';
             const url = new URL(pathnameWithParams, 'http://gracile-static');
             // MARK: Render
-            const { output } = await renderRouteTemplate({
+            const { output, document } = await renderRouteTemplate({
                 //
-                request: { url: url.href },
+                // request: { url: url.href },
+                url: url.href,
                 vite,
                 mode: 'build',
                 routeInfos: {
@@ -90,6 +114,7 @@ export async function renderRoutes({ vite, serverMode, root = process.cwd(), gra
                 name,
                 html: htmlString,
                 savePrerender,
+                static: { props, document },
             };
             renderedRoutes.push(rendered);
         }));

package/dist/dev/dev.d.ts

@@ -1,10 +1,13 @@
 import { type ViteDevServer } from 'vite';
+import type { RoutesManifest } from '../routes/route.js';
 import { type GracileHandler } from '../server/request.js';
 import type { GracileConfig } from '../user-config.js';
-export declare function createDevHandler({ vite, gracileConfig, }: {
+export declare function createDevHandler({ routes, vite, gracileConfig, }: {
+    routes: RoutesManifest;
     vite: ViteDevServer;
     gracileConfig: GracileConfig;
 }): Promise<{
     handler: GracileHandler;
+    routes: RoutesManifest;
 }>;
 //# sourceMappingURL=dev.d.ts.map

package/dist/dev/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/dev/dev.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,EAEN,KAAK,cAAc,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,wBAAsB,gBAAgB,CAAC,EACtC,IAAI,EACJ,aAAa,GACb,EAAE;IACF,IAAI,EAAE,aAAa,CAAC;IACpB,aAAa,EAAE,aAAa,CAAC;CAC7B,GAAG,OAAO,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;CACxB,CAAC,CAoCD"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/dev/dev.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAEN,KAAK,cAAc,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,wBAAsB,gBAAgB,CAAC,EACtC,MAAM,EACN,IAAI,EACJ,aAAa,GACb,EAAE;IACF,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,aAAa,CAAC;IACpB,aAAa,EAAE,aAAa,CAAC;CAC7B,GAAG,OAAO,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,cAAc,CAAC;CACvB,CAAC,CA4CD"}

package/dist/dev/dev.js

@@ -4,17 +4,17 @@ import {} from 'vite';
 import { collectRoutes } from '../routes/collect.js';
 import { createGracileHandler, } from '../server/request.js';
 import { generateRoutesTypings } from './route-typings.js';
-export async function createDevHandler({ vite, gracileConfig, }) {
+export async function createDevHandler({ routes, vite, gracileConfig, }) {
     const root = vite.config.root;
     logger.info(c.dim('\nCreating handler…'), { timestamp: true });
-    const routes = await collectRoutes(root, gracileConfig.routes?.exclude);
+    await collectRoutes(routes, root, gracileConfig.routes?.exclude);
     if (gracileConfig.experimental?.generateRoutesTypings)
         generateRoutesTypings(root, routes).catch((error) => logger.error(String(error)));
     vite.watcher.on('all', (event, file) => {
         // console.log({ event });
-        if (file.match(/\/src\/routes\/(.*)\.(ts|js)$/) &&
+        if (file.match(/\/src\/routes\/(.*)\.(ts|js|css|scss|sass|less|styl|stylus)$/) &&
             ['add', 'unlink'].includes(event))
-            collectRoutes(root, gracileConfig.routes?.exclude)
+            collectRoutes(routes, root, gracileConfig.routes?.exclude)
                 .then(() => {
                 vite.hot.send('vite:invalidate');
                 if (gracileConfig.experimental?.generateRoutesTypings)
@@ -25,6 +25,12 @@ export async function createDevHandler({ vite, gracileConfig, }) {
     //
     // NOTE: Wrong place?
     const serverMode = false;
-    const gracile = createGracileHandler({ vite, root, serverMode, routes });
-    return { handler: gracile };
+    const gracile = createGracileHandler({
+        vite,
+        root,
+        serverMode,
+        routes,
+        gracileConfig,
+    });
+    return { handler: gracile, routes };
 }

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAItD,YAAY,EAAE,aAAa,EAAE,CAAC;AAI9B;;;;;;;;;;;;;;;;;GAiBG;AAGH,eAAO,MAAM,OAAO,YAAa,aAAa,KAAG,GAAG,EA4QnD,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAOtD,YAAY,EAAE,aAAa,EAAE,CAAC;AAI9B;;;;;;;;;;;;;;;;;GAiBG;AAIH,eAAO,MAAM,OAAO,YAAa,aAAa,KAAG,GAAG,EA4RnD,CAAC"}

package/dist/plugin.js

@@ -7,7 +7,7 @@ import {} from './build/static.js';
 import { createDevHandler } from './dev/dev.js';
 import { nodeAdapter } from './server/adapters/node.js';
 import { buildRoutes } from './vite/plugins/build-routes.js';
-import { virtualRoutes } from './vite/plugins/virtual-routes.js';
+import { virtualRoutes, virtualRoutesClient, } from './vite/plugins/virtual-routes.js';
 let isClientBuilt = false;
 /**
  * The main Vite plugin for loading the Gracile framework.
@@ -27,44 +27,54 @@ let isClientBuilt = false;
  * });
  * ```
  */
-// Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
+// NOTE: for Vite versions mismatches with `exactOptionalPropertyTypes`?
+// 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 outputMode = config?.output || 'static';
     const clientAssets = {};
-    let routes = null;
+    const routes = new Map();
     let renderedRoutes = null;
     let root = null;
     const gracileConfig = config || {};
     if (isClientBuilt)
         return [];
     isClientBuilt = true;
+    const virtualRoutesForClient = virtualRoutesClient({
+        mode: outputMode,
+        routes,
+        // NOTE: This will be a dedicated setting when it will not be experimental
+        // anymore.
+        gracileConfig,
+        // enabled: gracileConfig?.pages?.premises?.expose || false,
+    });
     return [
-        {
-            name: 'gracile-routes-codegen',
-            // watchChange(change) {
-            // 	console.log({ change });
-            // },
-            resolveId(id) {
-                const virtualModuleId = 'gracile:route';
-                const resolvedVirtualModuleId = `\0${virtualModuleId}`;
-                if (id === virtualModuleId) {
-                    return resolvedVirtualModuleId;
-                }
-                return null;
-            },
-            load(id) {
-                const virtualModuleId = 'gracile:route';
-                const resolvedVirtualModuleId = `\0${virtualModuleId}`;
-                if (id === resolvedVirtualModuleId) {
-                    return `
-export function route(input){
-return input;
-}`;
-                }
-                return null;
-            },
-        },
+        // 		{
+        // 			name: 'gracile-routes-codegen',
+        // 			// watchChange(change) {
+        // 			// 	console.log({ change });
+        // 			// },
+        // 			resolveId(id) {
+        // 				const virtualModuleId = 'gracile:route';
+        // 				const resolvedVirtualModuleId = `\0${virtualModuleId}`;
+        // 				if (id === virtualModuleId) {
+        // 					return resolvedVirtualModuleId;
+        // 				}
+        // 				return null;
+        // 			},
+        // 			load(id) {
+        // 				const virtualModuleId = 'gracile:route';
+        // 				const resolvedVirtualModuleId = `\0${virtualModuleId}`;
+        // 				if (id === resolvedVirtualModuleId) {
+        // 					return `
+        // export function route(input){
+        // return input;
+        // }`;
+        // 				}
+        // 				return null;
+        // 			},
+        // 		},
+        virtualRoutesForClient,
         {
             name: 'vite-plugin-gracile-serve-middleware',
             apply: 'serve',
@@ -72,6 +82,9 @@ return input;
                 return {
                     // NOTE: Supresses message: `Could not auto-determine entry point from rollupOptions or html files…`
                     optimizeDeps: { include: [] },
+                    // resolve: {
+                    // 	conditions: ['development'],
+                    // },
                 };
             },
             async configureServer(server) {
@@ -90,10 +103,11 @@ return input;
                 // 	version: number;
                 // };
                 const version = process.env['__GRACILE_VERSION__'];
-                logger.info(`${c.cyan(c.italic(c.underline('🧚 Gracile ')))}` +
-                    ` ${c.green(` v${version ?? 'X'}`)}`);
+                logger.info(`${c.cyan(c.italic(c.underline('🧚 Gracile')))}` +
+                    ` ${c.dim(`~`)} ${c.green(`v${version ?? 'X'}`)}`);
                 // ---
                 const { handler } = await createDevHandler({
+                    routes,
                     vite: server,
                     gracileConfig,
                 });
@@ -115,14 +129,15 @@ return input;
                     server: { middlewareMode: true },
                     // NOTE: Stub. KEEP IT!
                     optimizeDeps: { include: [] },
+                    plugins: [virtualRoutesForClient],
                 });
                 const htmlPages = await buildRoutes({
                     viteServerForBuild: viteServerForClientHtmlBuild,
                     root: viteConfig.root || process.cwd(),
                     gracileConfig,
                     serverMode: outputMode === 'server',
+                    routes,
                 });
-                routes = htmlPages.routes;
                 renderedRoutes = htmlPages.renderedRoutes;
                 await viteServerForClientHtmlBuild.close();
                 return {
@@ -180,7 +195,6 @@ return input;
                                 // NOTE: Useful for, e.g., link tag with `?url`
                                 assetFileNames: (chunkInfo) => {
                                     if (chunkInfo.name) {
-                                        //  (chunkInfo);
                                         const fileName = clientAssets[chunkInfo.name];
                                         if (fileName)
                                             return fileName;
@@ -195,10 +209,8 @@ return input;
                         },
                     },
                     plugins: [
-                        virtualRoutes({
-                            routes,
-                            renderedRoutes,
-                        }),
+                        virtualRoutesForClient,
+                        virtualRoutes({ routes, renderedRoutes }),
                         {
                             name: 'vite-plugin-gracile-entry',
                             resolveId(id) {
@@ -211,16 +223,15 @@ return input;
                                 if (id === 'entrypoint.js' && routes && renderedRoutes) {
                                     return `
 import { routeAssets, routeImports, routes } from 'gracile:routes';
-import { createGracileMiddleware } from '@gracile/gracile/_internals/server-runtime';
-
-//  ({ routeAssets, routeImports, routes })
+import { createGracileHandler } from '@gracile/gracile/_internals/server-runtime';
 
-export const handler = createGracileMiddleware({
+export const handler = createGracileHandler({
 	root: process.cwd(),
 	routes,
 	routeImports,
 	routeAssets,
 	serverMode: true,
+	gracileConfig: ${JSON.stringify(gracileConfig, null, 2)}
 });
 `;
                                 }

package/dist/render/markers.d.ts

@@ -0,0 +1,3 @@
+export declare const SSR_OUTLET_MARKER = "<route-template-outlet></route-template-outlet>";
+export declare const PAGE_ASSETS_MARKER = "<!--__GRACILE_PAGE_ASSETS__-->";
+//# sourceMappingURL=markers.d.ts.map

package/dist/render/markers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../src/render/markers.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iBAAiB,oDACoB,CAAC;AAGnD,eAAO,MAAM,kBAAkB,mCAAmC,CAAC"}

package/dist/render/markers.js

@@ -0,0 +1,4 @@
+// export const SSR_OUTLET_MARKER = '________SSR_OUTLET________';
+export const SSR_OUTLET_MARKER = '<route-template-outlet></route-template-outlet>';
+// const SSR_OUTLET = unsafeHTML(SSR_OUTLET_MARKER);
+export const PAGE_ASSETS_MARKER = '<!--__GRACILE_PAGE_ASSETS__-->';

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

@@ -1,25 +1,20 @@
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 import type { ViteDevServer } from 'vite';
 import type { RouteInfos } from '../routes/match.js';
 import type * as R from '../routes/route.js';
-export declare const SSR_OUTLET_MARKER = "<route-template-outlet></route-template-outlet>";
-export declare const PAGE_ASSETS_MARKER = "<!--__GRACILE_PAGE_ASSETS__-->";
 export declare const REGEX_TAG_SCRIPT: RegExp;
 export declare const REGEX_TAG_LINK: RegExp;
-export type HandlerInfos = {
-    data: unknown;
-    method: string;
-};
-export declare function renderRouteTemplate({ request, vite, mode, routeInfos, handlerInfos, routeAssets, serverMode, }: {
-    request: Request | R.StaticRequest;
+export declare function renderRouteTemplate({ url, vite, mode, routeInfos, routeAssets, serverMode, docOnly, }: {
+    url: string;
     vite?: ViteDevServer | undefined;
     mode: 'dev' | 'build';
     routeInfos: RouteInfos;
-    handlerInfos?: HandlerInfos | undefined;
     routeAssets?: R.RoutesAssets | undefined;
     root: string;
     serverMode?: boolean | undefined;
+    docOnly?: boolean | undefined;
 }): Promise<{
     output: null | Readable;
+    document: null | string;
 }>;
 //# sourceMappingURL=route-template.d.ts.map

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":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,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,iBAAiB,oDACoB,CAAC;AAGnD,eAAO,MAAM,kBAAkB,mCAAmC,CAAC;AAEnE,eAAO,MAAM,gBAAgB,QACkC,CAAC;AAEhE,eAAO,MAAM,cAAc,QAA2B,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D,wBAAsB,mBAAmB,CAAC,EACzC,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,YAAY,EACZ,WAAW,EAEX,UAAU,GACV,EAAE;IACF,OAAO,EAAE,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC;IACnC,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,WAAW,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,SAAS,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACjC,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAA;CAAE,CAAC,CA0LvC"}
+{"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"}

package/dist/render/route-template.js

@@ -1,8 +1,9 @@
+import { Readable } from 'node:stream';
 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 { Readable } from 'stream';
 import { isLitServerTemplate, isLitTemplate } from '../assertions.js';
+import { PAGE_ASSETS_MARKER, SSR_OUTLET_MARKER } from './markers.js';
 async function* concatStreams(...readables) {
     // eslint-disable-next-line no-restricted-syntax
     for (const readable of readables) {
@@ -12,26 +13,16 @@ async function* concatStreams(...readables) {
         }
     }
 }
-// export const SSR_OUTLET_MARKER = '________SSR_OUTLET________';
-export const SSR_OUTLET_MARKER = '<route-template-outlet></route-template-outlet>';
-// const SSR_OUTLET = unsafeHTML(SSR_OUTLET_MARKER);
-export const PAGE_ASSETS_MARKER = '<!--__GRACILE_PAGE_ASSETS__-->';
 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({ request, vite, mode, routeInfos, handlerInfos, routeAssets, 
-// root,
-serverMode, }) {
+export async function renderRouteTemplate({ url, vite, mode, routeInfos, routeAssets, serverMode, docOnly, }) {
     if (!routeInfos.routeModule.document && !routeInfos.routeModule.template)
-        return { output: null };
+        return { output: null, document: null };
     // MARK: Context
     const context = {
-        url: new URL(request.url),
+        url: new URL(url),
         params: routeInfos.params,
-        props: handlerInfos?.data
-            ? {
-                [handlerInfos.method]: handlerInfos.data,
-            }
-            : routeInfos.props,
+        props: routeInfos.props,
     };
     // MARK: Fragment
     if (!routeInfos.routeModule.document && routeInfos.routeModule.template) {
@@ -40,7 +31,7 @@ serverMode, }) {
             throw Error(`Wrong template result for fragment template ${routeInfos.foundRoute.filePath}.`);
         const fragmentRender = renderLitSsr(fragmentOutput);
         const output = Readable.from(fragmentRender);
-        return { output };
+        return { output, document: null };
     }
     // MARK: Document
     if (!routeInfos.routeModule.document ||
@@ -54,29 +45,28 @@ serverMode, }) {
     let baseDocRenderedWithAssets = baseDocRendered;
     // If the user doesnt use `pageAssetCustomLocation`, we put this as a fallback
     baseDocRenderedWithAssets = baseDocRenderedWithAssets
-        .replace('</head>', `${PAGE_ASSETS_MARKER}</head>`)
+        .replace('</head>', `\n${PAGE_ASSETS_MARKER}</head>`)
         .replace(PAGE_ASSETS_MARKER, 
     // eslint-disable-next-line prefer-template
-    html `
-				<!-- PAGE ASSETS -->
-				${routeInfos.foundRoute.pageAssets.map((path) => {
-        //
-        if (/\.(js|ts)$/.test(path)) {
-            return html `
-							<script type="module" src="/${path}"></script>
-							<!--  -->
-						`;
-        }
-        if (/\.(css|scss|sass|less|styl|stylus)$/.test(path)) {
-            return html `
-							<link rel="stylesheet" href="/${path}" />
-							<!--  -->
-						`;
-        }
-        throw new Error('Unknown asset.');
-    })}
-				<!-- /PAGE ASSETS -->
-			`);
+    routeInfos.foundRoute.pageAssets.length
+        ? // eslint-disable-next-line prefer-template
+            html `<!-- PAGE ASSETS -->` +
+                `${routeInfos.foundRoute.pageAssets
+                    .map((path) => {
+                    //
+                    if (/\.(js|ts)$/.test(path)) {
+                        // prettier-ignore
+                        return html `		<script type="module" src="/${path}"></script>`;
+                    }
+                    if (/\.(css|scss|sass|less|styl|stylus)$/.test(path)) {
+                        // prettier-ignore
+                        return html `		<link rel="stylesheet" href="/${path}" />`;
+                    }
+                    throw new Error('Unknown asset.');
+                })
+                    .join('\n')}` +
+                `<!-- /PAGE ASSETS -->\n		`
+        : '');
     // MARK: Dev. overlay
     // TODO: Need more testing and refinement (refreshes kills its usefulness)
     const overlay = () => html `
@@ -118,6 +108,8 @@ serverMode, }) {
         // `${routeInfos.pathname}?r=${Math.random()}`,
         routeInfos.pathname, baseDocRenderedWithAssets)
         : baseDocRenderedWithAssets;
+    if (docOnly)
+        return { document: baseDocHtml, output: null };
     const index = baseDocHtml.indexOf(SSR_OUTLET_MARKER);
     const baseDocRenderStreamPre = Readable.from(baseDocHtml.substring(0, index));
     const baseDocRenderStreamPost = Readable.from(baseDocHtml.substring(index + SSR_OUTLET_MARKER.length + 1));
@@ -134,15 +126,15 @@ serverMode, }) {
         // 	const output = Readable.from(
         // 		concatStreams(baseDocRenderStreamPre, baseDocRenderStreamPost),
         // 	);
-        // 	return { output };
+        // 	return { output, document: null };
         // }
         if (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));
-        return { output };
+        return { output, document: baseDocHtml };
     }
     // MARK: Just the document
     const output = Readable.from(baseDocHtml);
-    return { output };
+    return { output, document: baseDocHtml };
 }

package/dist/render/utils.d.ts

@@ -1,3 +1,26 @@
 import { type ServerRenderedTemplate } from '@lit-labs/ssr';
-export declare function renderSsrTemplate(template: ServerRenderedTemplate): Promise<string>;
+import type { TemplateResult } from 'lit';
+/**
+ * Just a tiny wrapper for `render` and `collectResult` from `@lit-labs/ssr`.
+ *
+ * Useful for testing server only partials.
+ *
+ * @example
+ * ```js
+ * import assert from 'node:assert';
+ * import {
+ * 	html,
+ * 	type ServerRenderedTemplate,
+ * } from '@gracile/gracile/server-html';
+ *
+ * const myServerTemplate1 = (): ServerRenderedTemplate => html`
+ * 	<div>Hello</div>
+ * `;
+ *
+ * const result = await renderLitTemplate(myServerTemplate1());
+ *
+ * assert.match(result, /Hello/);
+ * ```
+ */
+export declare function renderLitTemplate(template: ServerRenderedTemplate | TemplateResult<1>): Promise<string>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/render/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/render/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,sBAAsB,EAC3B,MAAM,eAAe,CAAC;AAGvB,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,mBAEvE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/render/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,sBAAsB,EAC3B,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAE1C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,iBAAiB,CACtC,QAAQ,EAAE,sBAAsB,GAAG,cAAc,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC,MAAM,CAAC,CAEjB"}

package/dist/render/utils.js

@@ -1,5 +1,27 @@
 import { render as renderLitSsr, } from '@lit-labs/ssr';
 import { collectResult } from '@lit-labs/ssr/lib/render-result.js';
-export async function renderSsrTemplate(template) {
+/**
+ * Just a tiny wrapper for `render` and `collectResult` from `@lit-labs/ssr`.
+ *
+ * Useful for testing server only partials.
+ *
+ * @example
+ * ```js
+ * import assert from 'node:assert';
+ * import {
+ * 	html,
+ * 	type ServerRenderedTemplate,
+ * } from '@gracile/gracile/server-html';
+ *
+ * const myServerTemplate1 = (): ServerRenderedTemplate => html`
+ * 	<div>Hello</div>
+ * `;
+ *
+ * const result = await renderLitTemplate(myServerTemplate1());
+ *
+ * assert.match(result, /Hello/);
+ * ```
+ */
+export async function renderLitTemplate(template) {
     return collectResult(renderLitSsr(template));
 }

package/dist/routes/collect.d.ts

@@ -1,3 +1,3 @@
 import type * as R from './route.js';
-export declare function collectRoutes(root: string, excludePatterns?: string[]): Promise<R.RoutesManifest>;
+export declare function collectRoutes(routes: R.RoutesManifest, root: string, excludePatterns?: string[]): Promise<R.RoutesManifest>;
 //# 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,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;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"}

package/dist/routes/collect.js

@@ -48,8 +48,8 @@ function extractRoutePatterns(routeFilePath) {
         hasParams,
     };
 }
-const routes = new Map();
-export async function collectRoutes(root /* vite: ViteDevServer */, excludePatterns = []) {
+// const routes: R.RoutesManifest = new Map<string, R.Route>();
+export async function collectRoutes(routes, root /* vite: ViteDevServer */, excludePatterns = []) {
     routes.clear();
     const routesFolder = 'src/routes';
     const routesFolderAbsolute = join(root, routesFolder);

package/dist/routes/match.js

@@ -19,14 +19,14 @@ function matchRouteFromUrl(url, routes) {
     const params = Object.freeze({ ...match.pathname.groups });
     return { match, foundRoute, params, pathname };
 }
-function extractStaticPaths(options) {
+async function extractStaticPaths(options) {
     if (!options.foundRoute.hasParams)
         return null;
     if (!options.routeModule.staticPaths)
         return null;
     const routeStaticPaths = options.routeModule.staticPaths;
     let props;
-    const staticPaths = routeStaticPaths();
+    const staticPaths = await Promise.resolve(routeStaticPaths());
     let hasCorrectParams = false;
     staticPaths.forEach((providedRouteOptions) => {
         const routeOptions = providedRouteOptions;
@@ -50,7 +50,7 @@ export async function getRoute(options) {
         route: foundRoute,
         routeImports: options.routeImports,
     });
-    const staticPaths = extractStaticPaths({
+    const staticPaths = await extractStaticPaths({
         routeModule,
         foundRoute,
         pathname,