ecto handlebars with improved partial support

src/engines/handlebars.ts

@@ -5,7 +5,7 @@
 import type {EngineInterface} from '../engine-interface.js';
 
 export class Handlebars extends BaseEngine implements EngineInterface {
-	public partialsPath = '/partials';
+	public partialsPath = ['partials', 'includes', 'templates'];
 
 	constructor(options?: Record<string, unknown>) {
 		super();
@@ -20,7 +20,7 @@
 	async render(source: string, data?: Record<string, unknown>): Promise<string> {
 		// Register partials
 		if (this.rootTemplatePath) {
-			this.registerPartials(this.rootTemplatePath + this.partialsPath);
+			this.initPartials();
 		}
 
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -36,7 +36,7 @@
 	renderSync(source: string, data?: Record<string, unknown>): string {
 		// Register partials
 		if (this.rootTemplatePath) {
-			this.registerPartials(this.rootTemplatePath + this.partialsPath);
+			this.initPartials();
 		}
 
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -49,17 +49,36 @@
 		return result;
 	}
 
+	initPartials(): void {
+		for (const path of this.partialsPath) {
+			const fullPath = `${this.rootTemplatePath}/${path}`;
+			this.registerPartials(fullPath);
+		}
+	}
+
 	registerPartials(partialsPath: string): boolean {
 		let result = false;
 		if (fs.pathExistsSync(partialsPath)) {
 			const partials = fs.readdirSync(partialsPath);
 
 			for (const p of partials) {
-				const source = fs.readFileSync(partialsPath + '/' + p).toString();
-				const name = p.split('.')[0];
-
-				if (handlebars.partials[name] === undefined) {
-					handlebars.registerPartial(name, handlebars.compile(source));
+				if (fs.statSync(partialsPath + '/' + p).isDirectory()) {
+					const dirPartials = fs.readdirSync(partialsPath + '/' + p);
+					for (const dp of dirPartials) {
+						const source = fs.readFileSync(partialsPath + '/' + p + '/' + dp).toString();
+						const name = p + '/' + dp.split('.')[0];
+						console.log(name);
+						if (handlebars.partials[name] === undefined) {
+							handlebars.registerPartial(name, handlebars.compile(source));
+						}
+					}
+				} else {
+					const source = fs.readFileSync(partialsPath + '/' + p).toString();
+					const name = p.split('.')[0];
+
+					if (handlebars.partials[name] === undefined) {
+						handlebars.registerPartial(name, handlebars.compile(source));
+					}
 				}
 			}
 

test/data/handlebars/example1.hbs

@@ -3,3 +3,4 @@
 
 {{>  foo }}
 
+{{>  layout/ux }}

test/data/handlebars/includes/blah.hbs

@@ -0,0 +1 @@
+Blah

test/data/handlebars/includes/layout/ux.hbs

@@ -0,0 +1 @@
+ux layout

test/ecto.test.ts

@@ -242,6 +242,7 @@ it('Render from Template - Handlebars', async () => {
 	const source = await ecto.renderFromFile(testRootDir + '/handlebars/example1.hbs', handlebarsExampleData, testRootDir + '/handlebars');
 
 	expect(source).toContain('<title>Alan O\'Connor - Header Title </title>');
+	expect(source).toContain('Foo!');
 });
 
 it('Find Template without Extension', async () => {

test/engines/handlebars.test.ts

@@ -63,9 +63,11 @@ it('Handlebars - Rendering with Partials', async () => {
 	const engine = new Handlebars();
 	const source = await fs.readFile(testTemplateDir + '/example1.hbs', 'utf8');
 	engine.rootTemplatePath = testTemplateDir;
+	const result = await engine.render(source, exampleData1);
 
-	expect(await engine.render(source, exampleData1)).toContain('Alan O\'Connor');
-	expect(await engine.render(source, exampleData1)).toContain('Foo!');
+	expect(result).toContain('Alan O\'Connor');
+	expect(result).toContain('Foo!');
+	expect(result).toContain('ux layout');
 });
 
 it('Handlebars - Render Sync with Partials', () => {