@rettangoli/vt 0.0.2-rc2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/vt",
-  "version": "0.0.2-rc2",
+  "version": "0.0.3",
   "description": "Rettangoli Visual Testing",
   "type": "module",
   "main": "./src/index.js",

package/src/cli/generate.js

@@ -53,19 +53,28 @@ async function main(options) {
 
   // Check for local templates first, fallback to library templates
   const localTemplatesPath = join(vtPath, "templates");
+
   const defaultTemplatePath = existsSync(join(localTemplatesPath, "default.html"))
-    ? join(localTemplatesPath, "default.html")
-    : join(libraryTemplatesPath, "default.html");
-  
+      ? join(localTemplatesPath, "default.html")
+      : join(libraryTemplatesPath, "default.html");
+
+  // Resolve index template path
   const indexTemplatePath = existsSync(join(localTemplatesPath, "index.html"))
-    ? join(localTemplatesPath, "index.html")
-    : join(libraryTemplatesPath, "index.html");
+      ? join(localTemplatesPath, "index.html")
+      : join(libraryTemplatesPath, "index.html");
+
+  // Build template configuration for per-file/section templates
+  const templateConfig = {
+    defaultTemplate: defaultTemplatePath,
+    vtPath: vtPath,
+  };
 
   // Generate HTML files
   const generatedFiles = await generateHtml(
     specsPath,
     defaultTemplatePath,
-    candidatePath
+    candidatePath,
+    templateConfig
   );
 
   // Generate overview page with all files

package/src/cli/templates/index.html

@@ -83,7 +83,7 @@
               <iframe
                 loading="lazy"
                 width="100%"
-                src="/candidate/{{ file.path }}"
+                src="/candidate/{{ file.path | remove_ext }}.html"
                 frameborder="0"
                 style="
                       width: 1080px;

package/src/common.js

@@ -47,6 +47,12 @@ engine.registerFilter("slug", (value) => {
   return value.toLowerCase().replace(/\s+/g, "-");
 });
 
+// Add custom filter to remove file extension
+engine.registerFilter("remove_ext", (value) => {
+  if (typeof value !== "string") return "";
+  return value.replace(/\.[^/.]+$/, "");
+});
+
 /**
  * Get all files from a directory recursively
  */
@@ -102,24 +108,16 @@ function ensureDirectoryExists(dirPath) {
     mkdirSync(absolutePath, { recursive: true });
   }
 }
-
 /**
  * Main function to generate HTML files from specs
  */
-async function generateHtml(specsDir, templatePath, outputDir) {
+async function generateHtml(specsDir, templatePath, outputDir, templateConfig) {
   try {
-    // Initialize LiquidJS engine
-
-    // Read template
-    const templateContent = readFileSync(templatePath, "utf8");
-
-    // Ensure output directory exists
+    const defaultTemplateContent = readFileSync(templatePath, "utf8");
     ensureDirectoryExists(outputDir);
 
-    // Get all files from specs directory
     const allFiles = getAllFiles(specsDir);
 
-    // Process each file
     const processedFiles = [];
     for (const filePath of allFiles) {
       const fileContent = readFileSync(filePath, "utf8");
@@ -130,31 +128,25 @@ async function generateHtml(specsDir, templatePath, outputDir) {
         theme: "slack-dark",
       });
 
-      // Parse YAML frontmatter
       let frontMatterObj = null;
       if (frontMatter) {
-        try {
-          frontMatterObj = loadYaml(frontMatter);
-        } catch (e) {
-          console.error(`Error parsing frontmatter in ${filePath}:`, e.message);
-        }
+        frontMatterObj = loadYaml(frontMatter);
       }
 
+      const relativePath = path.relative(specsDir, filePath);
+
+      let templateToUse = defaultTemplateContent;
+      const resolvedTemplatePath = frontMatterObj.template ? 
+        join(templateConfig.vtPath, "templates", frontMatterObj.template) :
+        templateConfig.defaultTemplate;
+      templateToUse = readFileSync(resolvedTemplatePath, "utf8"); 
+
       // Render template
-      let renderedContent = "";
-      try {
-        renderedContent = engine.parseAndRenderSync(templateContent, {
-          content: content,
-          frontMatter: frontMatterObj || {},
-        });
-      } catch (error) {
-        console.error(`Error rendering template for ${filePath}:`, error);
-        renderedContent = `<html><body><h1>Error rendering template</h1><p>${error.message}</p><pre>${content}</pre></body></html>`;
-      }
+      const renderedContent = engine.parseAndRenderSync(templateToUse, {
+        content: content,
+        frontMatter: frontMatterObj || {},
+      });
 
-      // Get relative path from specs directory
-      const relativePath = path.relative(specsDir, filePath);
-      
       // Save file
       const outputPath = join(outputDir, convertToHtmlExtension(relativePath));
       ensureDirectoryExists(dirname(outputPath));
@@ -174,8 +166,7 @@ async function generateHtml(specsDir, templatePath, outputDir) {
     console.log(`Successfully generated ${processedFiles.length} files`);
     return processedFiles;
   } catch (error) {
-    console.error("Error generating HTML:", error);
-    throw error;
+    throw new Error("Error generating HTML:", error);
   }
 }