@gracile/engine 0.1.1 → 0.2.0-next.1

package/ambient.d.ts

@@ -1,7 +1,12 @@
 /// <reference types="vite/client" />
 
-declare module 'gracile:routes' {
-	export const routes: import('./src/routes/route.js').RoutesManifest;
-	export const routeImports: import('./src/routes/route.js').RoutesImports;
-	export const routeAssets: import('./src/routes/route.js').RoutesAssets;
+// NOTE: It's not exposed to user-land anyway, and gets bundled away
+// declare module 'gracile:routes' {
+// 	export const routes: import('./src/routes/route.js').RoutesManifest;
+// 	export const routeImports: import('./src/routes/route.js').RoutesImports;
+// 	export const routeAssets: import('./src/routes/route.js').RoutesAssets;
+// }
+
+declare namespace App {
+	interface Locals {}
 }

package/dist/assertions.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=assertions.test.d.ts.map

package/dist/assertions.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assertions.test.d.ts","sourceRoot":"","sources":["../src/assertions.test.ts"],"names":[],"mappings":""}

package/dist/assertions.test.js

@@ -0,0 +1,22 @@
+/* eslint-disable @typescript-eslint/no-floating-promises */
+import assert from 'node:assert/strict';
+import test, { describe } from 'node:test';
+import { html as serverHtml } from '@lit-labs/ssr';
+import { html } from 'lit';
+import { isLitNormalTemplate, isLitServerTemplate, isLitTemplate, isUnknownObject, } from './assertions.js';
+describe('should assert lit templates', () => {
+    test('assert lit', () => {
+        const lit = html ` <div>Hello</div> `;
+        const litServer = serverHtml ` <div>Hello</div> `;
+        assert.equal(isLitTemplate(lit), true);
+        assert.equal(isLitTemplate(litServer), true);
+        assert.equal(isLitNormalTemplate(lit), true);
+        assert.equal(isLitServerTemplate(litServer), true);
+        assert.equal(isUnknownObject({ something: 'something' }), true);
+        //
+        assert.equal(isLitTemplate([]), false);
+        assert.equal(isLitTemplate([]), false);
+        assert.equal(isLitNormalTemplate([]), false);
+        assert.equal(isLitServerTemplate([]), false);
+    });
+});

package/dist/dev/dev.d.ts

@@ -1,9 +1,8 @@
-export declare function dev(options: {
-    port?: number | undefined;
-    root?: string | undefined;
-    expose?: boolean | undefined;
-}): Promise<void | {
-    port: number;
-    instance: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+import { type ViteDevServer } from 'vite';
+import { type ConnectLikeAsyncMiddleware } from '../server/request.js';
+export declare function createHandlers({ vite, }: {
+    vite: ViteDevServer;
+}): Promise<{
+    handlers: ConnectLikeAsyncMiddleware;
 }>;
 //# 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":"AAYA,wBAAsB,GAAG,CAAC,OAAO,EAAE;IAClC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B;;;GAuBA"}
+{"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,EACN,KAAK,0BAA0B,EAE/B,MAAM,sBAAsB,CAAC;AAE9B,wBAAsB,cAAc,CAAC,EACpC,IAAI,GACJ,EAAE;IACF,IAAI,EAAE,aAAa,CAAC;CACpB,GAAG,OAAO,CAAC;IACX,QAAQ,EAAE,0BAA0B,CAAC;CACrC,CAAC,CA4BD"}

package/dist/dev/dev.js

@@ -1,21 +1,28 @@
 import { logger } from '@gracile/internal-utils/logger';
-import { setCurrentWorkingDirectory } from '@gracile/internal-utils/paths';
 import c from 'picocolors';
-import { getConfigs } from '../vite/config.js';
-import { createStandaloneDevServer, DEFAULT_DEV_SERVER_PORT, DEFAULT_USER_SERVER_MODULE_ENTRYPOINT, startUserProvidedServer, } from './server.js';
-export async function dev(options) {
-    logger.info(c.gray('\n— Development mode —\n'));
-    const root = setCurrentWorkingDirectory(options.root);
-    const { userConfigGracile } = await getConfigs(root, 'dev');
-    const port = options.port ?? userConfigGracile?.port ?? DEFAULT_DEV_SERVER_PORT;
-    const entrypoint = userConfigGracile?.server?.entrypoint ??
-        DEFAULT_USER_SERVER_MODULE_ENTRYPOINT;
-    if (userConfigGracile?.output === 'server') {
-        logger.info(c.gray(`\n— User provided ${c.cyan('server')} mode —\n`));
-        return startUserProvidedServer({
-            root,
-            entrypoint,
-        });
-    }
-    return createStandaloneDevServer({ root, port });
+import {} from 'vite';
+import { collectRoutes } from '../routes/collect.js';
+import { createGracileMiddleware, } from '../server/request.js';
+export async function createHandlers({ vite, }) {
+    const root = vite.config.root;
+    logger.info(c.green('creating handler…'), { timestamp: true });
+    const routes = await collectRoutes(root /* vite */);
+    vite.watcher.on('all', (event, file) => {
+        // console.log({ event });
+        if (file.match(/\/src\/routes\/(.*)\.(ts|js)$/) &&
+            event === 'add'
+        /*  &&
+        ['add', 'unlink',''].includes(event) */
+        )
+            collectRoutes(root /* { file, event } */ /* , vite */)
+                .then(() => {
+                vite.hot.send('vite:invalidate');
+            })
+                .catch((e) => logger.error(String(e)));
+    });
+    //
+    // NOTE: Wrong place?
+    const serverMode = false;
+    const gracile = createGracileMiddleware({ vite, root, serverMode, routes });
+    return { handlers: gracile };
 }

package/dist/plugin.d.ts

@@ -0,0 +1,5 @@
+import { type PluginOption } from 'vite';
+export declare const gracile: (config?: {
+    mode: "server" | "static";
+}) => PluginOption;
+//# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,MAAM,CAAC;AAU9D,eAAO,MAAM,OAAO,YAAa;IAChC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC1B,KAAG,YA+MH,CAAC"}

package/dist/plugin.js

@@ -0,0 +1,175 @@
+import { join } from 'node:path';
+import { rename, rm } from 'fs/promises';
+import { build, createServer } from 'vite';
+import {} from './build/static.js';
+import { createHandlers } from './dev/dev.js';
+import { buildRoutes } from './vite/plugins/build-routes.js';
+import { virtualRoutes } from './vite/plugins/virtual-routes.js';
+export const gracile = (config) => {
+    const mode = config?.mode || 'static';
+    const clientAssets = {};
+    let routes = null;
+    let renderedRoutes = null;
+    let root = null;
+    return [
+        {
+            name: 'vite-plugin-gracile-serve-middleware',
+            apply: 'serve',
+            config() {
+                return {
+                    // NOTE: Supresses message: `Could not auto-determine entry point from rollupOptions or html files…`
+                    optimizeDeps: { include: [] },
+                };
+            },
+            async configureServer(server) {
+                //  ({ plmugi: server.config.root });
+                const { handlers } = await createHandlers({ vite: server });
+                return () => {
+                    server.middlewares.use((req, res, next) => {
+                        Promise.resolve(handlers(req, res, next)).catch((error) => next(error));
+                    });
+                };
+            },
+        },
+        {
+            name: 'vite-plugin-gracile-build',
+            apply: 'build',
+            async config(viteConfig) {
+                const viteServerForClientHtmlBuild = await createServer({
+                    // configFile: false,
+                    root: viteConfig.root || process.cwd(),
+                });
+                const htmlPages = await buildRoutes({
+                    viteServerForBuild: viteServerForClientHtmlBuild,
+                    root: viteConfig.root || process.cwd(),
+                    _config: {},
+                    serverMode: mode === 'server',
+                });
+                routes = htmlPages.routes;
+                renderedRoutes = htmlPages.renderedRoutes;
+                await viteServerForClientHtmlBuild.close();
+                return {
+                    plugins: viteServerForClientHtmlBuild.config.plugins.filter((p) => p.name),
+                    build: {
+                        rollupOptions: {
+                            input: htmlPages.inputList,
+                            plugins: [htmlPages.plugin],
+                        },
+                        outDir: mode === 'server' ? 'dist/client' : 'dist',
+                    },
+                };
+            },
+        },
+        {
+            name: 'vite-plugin-gracile-collect-client-assets-for-server',
+            writeBundle(_, bundle) {
+                if (mode === 'static')
+                    return;
+                Object.entries(bundle).forEach(([, file]) => {
+                    if (file.type === 'asset' && file.name)
+                        clientAssets[file.name] = file.fileName;
+                });
+            },
+        },
+        {
+            name: 'vite-plugin-gracile-server-build',
+            apply: 'build',
+            config(viteConfig) {
+                root = viteConfig.root || null;
+            },
+            async closeBundle() {
+                if (mode === 'static' || !routes || !renderedRoutes)
+                    return;
+                await build({
+                    configFile: false,
+                    root: root || process.cwd(),
+                    ssr: {
+                        external: ['@gracile/gracile'],
+                    },
+                    build: {
+                        target: 'esnext',
+                        ssr: true,
+                        copyPublicDir: false,
+                        outDir: 'dist/server',
+                        ssrEmitAssets: true,
+                        cssMinify: true,
+                        cssCodeSplit: true,
+                        rollupOptions: {
+                            input: 'entrypoint.js',
+                            // external: ['@gracile/gracile'],
+                            // FIXME: ~~MUST import css from client somewhere.~~
+                            // ~~Hack could be using dynamic imports on client, so asset is picked up~~
+                            output: {
+                                entryFileNames: '[name].js',
+                                // assetFileNames: 'assets/[name].[ext]',
+                                // NOTE: Useful for, e.g., link tag with `?url`
+                                assetFileNames: (chunkInfo) => {
+                                    if (chunkInfo.name) {
+                                        //  (chunkInfo);
+                                        const fileName = clientAssets[chunkInfo.name];
+                                        if (fileName)
+                                            return fileName;
+                                        // NOTE: When not imported at all from client
+                                        return `assets/${chunkInfo.name.replace(/\.(.*)$/, '')}-[hash].[ext]`;
+                                    }
+                                    // throw new Error(`Not client asset`);
+                                    return 'assets/[name]-[hash].[ext]';
+                                },
+                                chunkFileNames: 'chunk/[name].js',
+                            },
+                        },
+                    },
+                    plugins: [
+                        virtualRoutes({
+                            routes,
+                            renderedRoutes,
+                        }),
+                        {
+                            name: 'vite-plugin-gracile-entry',
+                            resolveId(id) {
+                                if (id === 'entrypoint.js') {
+                                    return id;
+                                }
+                                return null;
+                            },
+                            load(id) {
+                                if (id === 'entrypoint.js' && routes && renderedRoutes) {
+                                    return `
+import { routeAssets, routeImports, routes } from 'gracile:routes';
+import { createGracileMiddleware } from '@gracile/gracile/plugin';
+
+//  ({ routeAssets, routeImports, routes })
+
+export const handler = createGracileMiddleware({
+	root: process.cwd(),
+	routes,
+	routeImports,
+	routeAssets,
+	serverMode: true,
+});
+`;
+                                }
+                                return null;
+                            },
+                        },
+                        {
+                            name: 'gracile-move-server-assets',
+                            async writeBundle(_, bundle) {
+                                const cwd = root || process.cwd();
+                                await Promise.all(Object.entries(bundle).map(async ([file]) => {
+                                    if (file.startsWith('assets/') === false)
+                                        return;
+                                    await rename(join(cwd, `/dist/server/${file}`), join(cwd, `/dist/client/${file}`));
+                                }));
+                                // NOTE: Disabled for now, because it conflict with test's folder comparer
+                                await rm(join(cwd, `/dist/server/assets`), {
+                                    recursive: true,
+                                }).catch(() => null);
+                            },
+                        },
+                    ],
+                });
+            },
+        },
+    ];
+};

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,UAAU,gDAA6C,CAAC;AAErE,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,CAgJvC"}
+{"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,UAAU,gDAA6C,CAAC;AAErE,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,CA6JvC"}

package/dist/render/route-template.js

@@ -63,7 +63,7 @@ serverMode, }) {
 						<!--  -->
 					`;
         }
-        if (/\.(scss|css)$/.test(path)) {
+        if (/\.(css|scss|sass|less|styl|stylus)$/.test(path)) {
             return html `
 						<link rel="stylesheet" href="/${path}" />
 						<!--  -->
@@ -89,19 +89,32 @@ serverMode, }) {
             .replace('</head>', `${routeAssetsString}\n</head>`);
     // MARK: Base document
     const baseDocHtml = vite && mode === 'dev'
-        ? await vite.transformIndexHtml(routeInfos.pathname, baseDocRenderedWithAssets)
+        ? await vite.transformIndexHtml(
+        // HACK: Sometimes, we need to invalidate for server asset url
+        // imports to work. So we keep this hack around just in case.
+        // Maybe it's linked to the way hashed assets are invalidating
+        // the html proxy module…
+        // `${routeInfos.pathname}?r=${Math.random()}`,
+        routeInfos.pathname, baseDocRenderedWithAssets)
         : baseDocRenderedWithAssets;
     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));
     // MARK: Page
     // Skipped with server mode in production build
-    if ((serverMode === false && routeInfos.routeModule.template) ||
-        //
-        (serverMode &&
-            routeInfos.routeModule.template &&
-            (mode !== 'build' || routeInfos.routeModule.prerender === true))) {
-        const routeOutput = await Promise.resolve(routeInfos.routeModule.template?.(context));
+    if (routeInfos.routeModule.template &&
+        (serverMode === false ||
+            //
+            (serverMode &&
+                (mode !== 'build' || routeInfos.routeModule.prerender === true)))) {
+        const routeOutput = await Promise.resolve(routeInfos.routeModule.template(context));
+        // NOTE: Explicitely unset template (maybe a bad idea as a feature. We'll see)
+        // if (routeOutput === null || routeOutput === undefined) {
+        // 	const output = Readable.from(
+        // 		concatStreams(baseDocRenderStreamPre, baseDocRenderStreamPost),
+        // 	);
+        // 	return { output };
+        // }
         if (isLitTemplate(routeOutput) === false)
             throw Error(`Wrong template result for page template ${routeInfos.foundRoute.filePath}.`);
         const renderStream = Readable.from(renderLitSsr(routeOutput));

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

@@ -1 +1 @@
-{"version":3,"file":"collect.d.ts","sourceRoot":"","sources":["../../src/routes/collect.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,KAAK,CAAC,MAAM,YAAY,CAAC;AA4DrC,wBAAsB,aAAa,CAClC,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAkF3B"}
+{"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,GAEV,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CA8F3B"}

package/dist/routes/collect.js

@@ -1,16 +1,15 @@
-import path, { join, relative } from 'node:path';
+import { join } from 'node:path';
 import { logger } from '@gracile/internal-utils/logger';
 import * as paths from '@gracile/internal-utils/paths';
-import fastGlob from 'fast-glob';
+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 { prepareSortableRoutes, routeComparator } from './comparator.js';
 import { REGEXES } from './load-module.js';
-function extractRoutePatterns(absoluteFilePath) {
-    const routePathname = path
-        .relative('src/routes', paths.relativeToProject(absoluteFilePath))
-        .replace(/\.[j|t]s$/, '');
+function extractRoutePatterns(routeFilePath) {
+    const routePathname = routeFilePath.replace(/\.[j|t]s$/, '');
     let pathParts = routePathname.split(process.platform === 'win32' ? '\\' : '/');
     const last = pathParts.at(-1);
     if (typeof last === 'undefined')
@@ -23,8 +22,9 @@ function extractRoutePatterns(absoluteFilePath) {
         pathParts.pop();
     if (pathParts.length === 1 && pathParts.at(0) === 'index')
         pathParts = [];
-    if (pathParts.length === 1 && pathParts.at(0) === '404')
-        pathParts = ['__404'];
+    // 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;
@@ -51,26 +51,37 @@ function extractRoutePatterns(absoluteFilePath) {
 const routes = new Map();
 export async function collectRoutes(root /* vite: ViteDevServer */) {
     routes.clear();
-    const serverEntrypoints = await fastGlob([
-        'src/routes/**/*.{js,ts}',
-        '!**/src/routes/**/*.client.{js,ts}',
-        '!**/src/routes/**/*.document.{js,ts}',
-        '!**/src/routes/**/_*/**',
-        '!**/src/routes/**/_*',
-    ], { ignore: [], cwd: root, absolute: true });
+    const routesFolder = 'src/routes';
+    const routesFolderAbsolute = join(root, routesFolder);
+    // relative(routesFolderAbsolute, file);
+    const allFilesInRoutes = await new Fdir()
+        .withRelativePaths()
+        .crawl(routesFolderAbsolute)
+        .withPromise();
+    // console.log({ allFilesInRoutes });
+    const serverEntrypointsFilter = createFilter(['**/*.{js,ts}'], [
+        //
+        '**/*.client.{js,ts}',
+        '**/*.document.{js,ts}',
+        '**/_*/**',
+        '**/_*',
+        '**/.*',
+    ]);
+    const serverEntrypoints = allFilesInRoutes.filter((f) => serverEntrypointsFilter(f));
     // MARK: Routes priority order
+    // TODO: `prepareSortableRoutes` and `routeComparator` in same function `sortRoutes`
     const serverEntrypointsSorted = prepareSortableRoutes(serverEntrypoints)
         .sort((a, b) => routeComparator(a, b))
         .map((r) => r.route);
-    const serverPageClientAssets = await fastGlob([
-        //
-        'src/routes/**/*.{css,scss}',
-        'src/routes/**/*.client.{js,ts}',
-    ], { ignore: [], cwd: root, absolute: true });
+    const serverPageClientAssetsFilter = createFilter([
+        '**/*.client.{js,ts}',
+        '**/*.{css,scss,sass,less,styl,stylus}',
+    ]);
+    const serverPageClientAssets = allFilesInRoutes.filter((f) => serverPageClientAssetsFilter(f));
     logger.info(`\n${c.underline(`Found ${c.bold('routes')}`)}:\n` +
         `${c.dim('- ')}${serverEntrypointsSorted
             .map((f) => {
-            const pathParts = relative(join(root, 'src/routes'), f).split('/');
+            const pathParts = f.split('/');
             return pathParts
                 .map((part, index) => {
                 if (part.match(/\[\./))
@@ -87,10 +98,11 @@ export async function collectRoutes(root /* vite: ViteDevServer */) {
         })
             .join(c.dim('\n- '))}\n`);
     // MARK: Associate
-    serverEntrypointsSorted.forEach((filePath) => {
-        const routeWithPatterns = extractRoutePatterns(filePath);
+    serverEntrypointsSorted.forEach((routePath) => {
+        const filePath = join(routesFolder, routePath);
+        const routeWithPatterns = extractRoutePatterns(routePath);
         routes.set(routeWithPatterns.patternString, {
-            filePath: paths.relativeToProject(filePath),
+            filePath,
             pattern: routeWithPatterns.pattern,
             hasParams: routeWithPatterns.hasParams,
             pageAssets: [],
@@ -98,15 +110,12 @@ export async function collectRoutes(root /* vite: ViteDevServer */) {
             // prerender: null,
         });
     });
-    serverPageClientAssets.forEach((filePath) => {
+    serverPageClientAssets.forEach((routePath) => {
         // NOTE: Exact extension needed client side by Vite.
-        const assetPathWithExt = paths.relativeToProject(filePath);
-        const associatedRoutePath = assetPathWithExt.replace(/\.(.*)$/, 
-        // FIXME: Don't need this anymore?
-        (_a, b) => `.${String(b)}`);
+        const assetPathWithExt = join(routesFolder, routePath);
         routes.forEach((route) => {
             if (paths.removeAllExt(route.filePath) ===
-                paths.removeAllExt(associatedRoutePath))
+                paths.removeAllExt(assetPathWithExt))
                 route.pageAssets.push(assetPathWithExt);
         });
     });

package/dist/routes/match.js

@@ -16,7 +16,7 @@ function matchRouteFromUrl(url, routes) {
     }
     if (!match || !foundRoute)
         throw new Error(`No route matching for ${url}`, { cause: 404 });
-    const params = match.pathname?.groups;
+    const params = Object.freeze({ ...match.pathname.groups });
     return { match, foundRoute, params, pathname };
 }
 function extractStaticPaths(options) {

package/dist/routes/route.d.ts

@@ -15,7 +15,6 @@ export declare const RequestMethod: {
 };
 export type ModuleOptions = {
     staticPaths?: StaticPathsGeneric;
-    locals?: (locals: any) => any;
     handler?: HandlerGeneric;
     prerender?: boolean | undefined;
     document?: DocumentTemplate<RouteContextGeneric>;
@@ -24,15 +23,15 @@ export type ModuleOptions = {
 export declare class RouteModule {
     #private;
     get staticPaths(): StaticPathsGeneric | undefined;
-    get locals(): ((locals: any) => any) | undefined;
-    get handler(): Handler<object | Response | undefined, any> | Partial<Record<MethodHtml, Handler<object | Response | undefined, any>> & Record<MethodNonHtml, Handler<Response, any>>> | undefined;
+    get locals(): {};
+    get handler(): Handler<object | Response | undefined> | Partial<Record<MethodHtml, Handler<object | Response | undefined>> & Record<MethodNonHtml, Handler<Response>>> | undefined;
     get document(): DocumentTemplate<RouteContextGeneric> | undefined;
     get prerender(): boolean | undefined;
     get template(): ((context: RouteContextGeneric) => RouteTemplateResult) | undefined;
     constructor(options: ModuleOptions);
 }
 export type Params = Record<string, string | undefined>;
-export type Handler<Data extends HandlerData | HandlerDataHtml = never, Locals = any> = (context: {
+export type Handler<Data extends HandlerData | HandlerDataHtml = never> = (context: {
     url: URL;
     /**
      * Parameters from dynamic route.
@@ -41,7 +40,7 @@ export type Handler<Data extends HandlerData | HandlerDataHtml = never, Locals =
      */
     params: Params;
     request: Request;
-    locals?: Locals;
+    locals: App.Locals;
     /**
      * Let you mutate the downstream **page** response.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/routes/route.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAK1C,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,CAAC;AACxC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AACjE,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,aAAa,CAAC;AAIhD,eAAO,MAAM,aAAa;;;;;;;;;CAShB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG;IAC3B,WAAW,CAAC,EAAE,kBAAkB,CAAmB;IAEnD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAC9B,OAAO,CAAC,EAAE,cAAc,CAAC;IAEzB,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEhC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAEjD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,mBAAmB,CAAC;CACjE,CAAC;AAGF,qBAAa,WAAW;;IAGvB,IAAW,WAAW,mCAErB;IAID,IAAW,MAAM,cApBC,GAAG,sBAsBpB;IAID,IAAW,OAAO,uLAEjB;IAID,IAAW,QAAQ,sDAElB;IAID,IAAW,SAAS,wBAEnB;IAID,IAAW,QAAQ,eArCE,mBAAmB,sCAuCvC;gBAEW,OAAO,EAAE,aAAa;CAqBlC;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;AAExD,MAAM,MAAM,OAAO,CAClB,IAAI,SAAS,WAAW,GAAG,eAAe,GAAG,KAAK,EAClD,MAAM,GAAG,GAAG,IAET,CAAC,OAAO,EAAE;IACb,GAAG,EAAE,GAAG,CAAC;IAET;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;SAKK;IACL,QAAQ,EAAE,YAAY,CAAC;CACvB,KAAK,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;AAE9C,MAAM,MAAM,cAAc,GACvB,OAAO,CAAC,WAAW,GAAG,eAAe,CAAC,GACtC,OAAO,CACP,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,GAAG,eAAe,CAAC,CAAC,GACzD,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CACxC,CAAC;AAEL,MAAM,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,EAAE,CAAC;AAElE,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC/C,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,MAAM,CAAC;AAEnD,MAAM,MAAM,wBAAwB,GAAG;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAE7C,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG;IACjC,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC,sBAAsB,CAAC,CAAC;AAClE,MAAM,MAAM,mBAAmB,GAAG,YAAY,CAC7C,cAAc,CAAC,CAAC,CAAC,GAAG,sBAAsB,CAC1C,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC3B,YAAY,SAAS,mBAAmB,GAAG,mBAAmB,IAE3D,CAAC,OAAO,EAAE,YAAY,KAAK,cAAc,CAAC;AAE9C,MAAM,MAAM,YAAY,CAAC,YAAY,IAAI,CACxC,OAAO,EAAE,YAAY,KACjB,mBAAmB,CAAC;AAKzB,MAAM,WAAW,KAAK;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CAErB;AAID,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAChD,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AACvE,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/routes/route.ts"],"names":[],"mappings":"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"}

package/dist/routes/route.js

@@ -10,7 +10,6 @@ export const RequestMethod = {
     OPTIONS: 'OPTIONS',
     PATCH: 'PATCH',
 };
-// TODO: put in engine
 export class RouteModule {
     #staticPaths;
     get staticPaths() {
@@ -43,7 +42,7 @@ export class RouteModule {
             typeof options.handler === 'function') &&
             options.handler)
             this.#handler = options.handler;
-        this.#locals = options.locals;
+        this.#locals = {};
         if (typeof options.template === 'function')
             this.#template = options.template;
         if (typeof options.document === 'function')

package/dist/server/env.d.ts

@@ -1,5 +1,6 @@
 export declare const IP_LOCALHOST = "127.0.0.1";
 export declare const IP_EXPOSED = "0.0.0.0";
 export declare const RANDOM_PORT = 0;
-export declare const PUBLIC_DIR: "public" | "./dist/client";
+export declare const PUBLIC_DIR = "public";
+export declare const CLIENT_DIST_DIR = "./dist/client";
 //# sourceMappingURL=env.d.ts.map

package/dist/server/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/server/env.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,cAAc,CAAC;AACxC,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,WAAW,IAAI,CAAC;AAE7B,eAAO,MAAM,UAAU,4BAEM,CAAC"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/server/env.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,cAAc,CAAC;AACxC,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,WAAW,IAAI,CAAC;AAK7B,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,eAAe,kBAAkB,CAAC"}

package/dist/server/env.js

@@ -1,6 +1,8 @@
 export const IP_LOCALHOST = '127.0.0.1';
 export const IP_EXPOSED = '0.0.0.0';
 export const RANDOM_PORT = 0;
-export const PUBLIC_DIR = import.meta.env?.DEV
-    ? 'public'
-    : './dist/client';
+// export const PUBLIC_DIR = import.meta.env?.DEV
+// 	? ('public' as const)
+// 	: ('./dist/client' as const);
+export const PUBLIC_DIR = 'public';
+export const CLIENT_DIST_DIR = './dist/client';

package/dist/server/request.d.ts

@@ -8,7 +8,7 @@ type NextFunction = (error?: unknown) => void | Promise<void>;
  * 1. Async.
  * 2. Can return a `ServerResponse`
  */
-export type ConnectLikeAsyncMiddleware = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void | NextFunction | ServerResponse> | (void | NextFunction | ServerResponse);
+export type ConnectLikeAsyncMiddleware = (req: IncomingMessage, res: ServerResponse, next: NextFunction, locals?: unknown) => Promise<void | NextFunction | ServerResponse> | (void | NextFunction | ServerResponse);
 export declare function createGracileMiddleware({ vite, routes, routeImports, routeAssets, root, serverMode, }: {
     vite?: ViteDevServer | undefined;
     routes: R.RoutesManifest;

package/dist/server/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/server/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAMjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAS1C,OAAO,KAAK,KAAK,CAAC,MAAM,oBAAoB,CAAC;AAE7C,KAAK,YAAY,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,MAAM,0BAA0B,GAAG,CACxC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,YAAY,KAEjB,OAAO,CAAC,IAAI,GAAG,YAAY,GAAG,cAAc,CAAC,GAE5C,CAAC,IAAI,GAAG,YAAY,GAAG,cAAc,CAAC,CAAC;AAM1C,wBAAgB,uBAAuB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,WAAW,EACX,IAAI,EACJ,UAAU,GACV,EAAE;IACF,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC;IAC3C,WAAW,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACjC,8BAsOA"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/server/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAMjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAO1C,OAAO,KAAK,KAAK,CAAC,MAAM,oBAAoB,CAAC;AAE7C,KAAK,YAAY,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,MAAM,0BAA0B,GAAG,CACxC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,OAAO,KAEf,OAAO,CAAC,IAAI,GAAG,YAAY,GAAG,cAAc,CAAC,GAE5C,CAAC,IAAI,GAAG,YAAY,GAAG,cAAc,CAAC,CAAC;AAM1C,wBAAgB,uBAAuB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,WAAW,EACX,IAAI,EACJ,UAAU,GACV,EAAE;IACF,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC;IAC3C,WAAW,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACjC,8BA+QA"}