feat: root cli flag, partial route prerender implementation

gracile-web · Jun 8, 2024 · 3634356 · 3634356
1 parent 976153c
commit 3634356
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 9 deletions.
diff --git a/packages/cli/src/bin/gracile-watch.ts b/packages/cli/src/bin/gracile-watch.ts
@@ -1,5 +1,7 @@
 // NOTE: shebang via `@gracile/gracile`
 
+import { join } from 'node:path';
+
 import { program } from '@commander-js/extra-typings';
 import { logger } from '@gracile/internal-utils/logger';
 
@@ -16,11 +18,13 @@ program
 	// .command('dev')
 	.option('-p, --port <number>', 'Assign a local port (overrides config. file)')
 	.option('-h, --host', 'Expose the server to you local network (0.0.0.0)')
+	.option('-r, --root <string>', 'Root directory for the project')
 	.action((_str, options) => {
 		const opts = options.opts();
 		dev({
 			port: opts.port ? Number(opts.port) : undefined,
 			expose: opts.host,
+			root: opts.root ? join(process.cwd(), opts.root) : undefined,
 		}).catch((e) => logger.error(String(e)));
 	});
 

diff --git a/packages/cli/src/bin/gracile.ts b/packages/cli/src/bin/gracile.ts
@@ -1,5 +1,7 @@
 // NOTE: shebang via `@gracile/gracile`
 
+import { join } from 'node:path';
+
 import { program } from '@commander-js/extra-typings';
 import { build } from '@gracile/engine/build/build';
 import { preview } from '@gracile/engine/preview';
@@ -10,21 +12,29 @@ import { greet } from '../utils.js';
 greet();
 
 // BUILD
-program.command('build').action((_str, _options) => {
-	build().catch((error) => logger.error(String(error)));
-});
+program
+	.command('build')
+	.option('-r, --root <string>', 'Root directory for the project')
+	.action((_str, options) => {
+		const opts = options.opts();
+		build(opts.root ? join(process.cwd(), opts.root) : undefined).catch(
+			(error) => logger.error(String(error)),
+		);
+	});
 
 // PREVIEW
 program
 	.command('preview')
-	.option('p, --port <number>')
-	.option('h, --host')
+	.option('-p, --port <number>', 'Assign a local port (overrides config. file)')
+	.option('-h, --host', 'Expose the server to you local network (0.0.0.0)')
+	.option('-r, --root <string>', 'Root directory for the project')
 
 	.action((_str, options) => {
 		const opts = options.opts();
 		preview({
 			port: opts.port ? Number(opts.port) : undefined,
 			expose: opts.host,
+			root: opts.root ? join(process.cwd(), opts.root) : undefined,
 		}).catch((error) => logger.error(String(error)));
 	});
 

diff --git a/packages/engine/src/dev/dev.ts b/packages/engine/src/dev/dev.ts
@@ -12,7 +12,7 @@ import {
 
 export async function dev(options: {
 	port?: number | undefined;
-	root?: string;
+	root?: string | undefined;
 	expose?: boolean | undefined;
 }) {
 	logger.info(c.gray('\n— Development mode —\n'));

diff --git a/packages/engine/src/preview.ts b/packages/engine/src/preview.ts
@@ -11,7 +11,7 @@ export async function preview({
 }: {
 	port?: number | undefined;
 	expose?: boolean | undefined;
-	root?: string;
+	root?: string | undefined;
 }) {
 	logger.info(c.gray('\n— Preview mode —\n'));
 

diff --git a/packages/engine/src/routes/route.ts b/packages/engine/src/routes/route.ts
@@ -25,9 +25,11 @@ export type ModuleOptions = {
 	staticPaths?: StaticPathsGeneric /* | undefined */;
 	handler?: HandlerGeneric;
 
-	template?: (context: RouteContextGeneric) => RouteTemplateResult;
+	prerender?: boolean | undefined;
 
 	document?: DocumentTemplate<RouteContextGeneric>;
+
+	template?: (context: RouteContextGeneric) => RouteTemplateResult;
 };
 
 // TODO: put in engine
@@ -50,6 +52,12 @@ export class RouteModule {
 		return this.#document;
 	}
 
+	readonly #prerender;
+
+	public get prerender() {
+		return this.#prerender;
+	}
+
 	readonly #template;
 
 	public get template() {
@@ -59,17 +67,22 @@ export class RouteModule {
 	constructor(options: ModuleOptions) {
 		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 (options.fragment) this.#fragment = options.fragment;
+
 		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;
 	}
 }
 

diff --git a/packages/engine/src/user-config.ts b/packages/engine/src/user-config.ts
@@ -3,6 +3,11 @@ import type { UserConfig } from 'vite';
 export class GracileConfig {
 	port?: number;
 
+	/**
+	 * Root directory for the project
+	 */
+	root?: string;
+
 	/**
 	 * @defaultValue 'static'
 	 */

diff --git a/packages/server/src/route.ts b/packages/server/src/route.ts
@@ -50,6 +50,9 @@ export function defineRoute<
 
 	staticPaths?: (() => StaticPathOptions[]) | undefined;
 
+	// TODO: Make it type dependent with handler
+	prerender?: boolean | undefined;
+
 	document?: R.DocumentTemplate<RouteContext>;
 
 	template?: R.BodyTemplate<RouteContext>;