@rettangoli/sites 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/sites",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Generate static sites using Markdown and YAML. Straightforward, zero-complexity. Complete toolkit for landing pages, blogs, documentation, admin dashboards, and more.git remote add origin git@github.com:yuusoft-org/sitic.git",
   "author": {
     "name": "Luciano Hanyon Wu",

package/src/cli/build.js

@@ -8,9 +8,10 @@ import { loadSiteConfig } from '../utils/loadSiteConfig.js';
  * @param {string} options.rootDir - Root directory of the site (defaults to cwd)
  * @param {Object} options.md - Optional markdown renderer
  * @param {boolean} options.quiet - Suppress build output logs
+ * @param {boolean} options.isScreenshotMode - Whether building for screenshot capture
  */
 export const buildSite = async (options = {}) => {
-  const { rootDir = process.cwd(), md, functions, quiet = false } = options;
+  const { rootDir = process.cwd(), md, functions, quiet = false, isScreenshotMode = false } = options;
 
   // Load config file if needed
   let config = {};
@@ -23,7 +24,8 @@ export const buildSite = async (options = {}) => {
     rootDir,
     md: md || config.mdRender,
     functions: functions || config.functions || {},
-    quiet
+    quiet,
+    isScreenshotMode
   });
 
   await build();

package/src/createSiteBuilder.js

@@ -31,7 +31,7 @@ function isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }
 
-export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet = false }) {
+export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet = false, isScreenshotMode = false }) {
   return async function build() {
     // Use provided md or default to rtglMarkdown
     const mdInstance = md || rtglMarkdown(MarkdownIt);
@@ -148,15 +148,18 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
             const frontmatter = extractFrontmatter(itemPath);
 
             // Calculate URL
-            const outputFileName = item.name.replace(/\.(yaml|md)$/, '.html');
-            const outputRelativePath = basePath ? path.join(basePath, outputFileName) : outputFileName;
-            let url = '/' + outputRelativePath.replace(/\\/g, '/').replace(/\.html$/, '');
-            // Special case: /index becomes /
-            if (url === '/index') {
-              url = '/';
+            const baseFileName = item.name.replace(/\.(yaml|md)$/, '');
+            let url;
+
+            // Special case: index files remain at root, others become directories
+            if (baseFileName === 'index') {
+              url = basePath ? '/' + basePath.replace(/\\/g, '/') : '/';
+              if (url !== '/') {
+                url = url + '/';
+              }
             } else {
-              // Add trailing slash for all non-root URLs
-              url = url + '/';
+              const pagePath = basePath ? path.join(basePath, baseFileName) : baseFileName;
+              url = '/' + pagePath.replace(/\\/g, '/') + '/';
             }
 
             // Process tags
@@ -227,19 +230,26 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
       const rawContent = lines.slice(contentStart).join('\n').trim();
 
       // Calculate URL for current page
-      let url = '/' + outputRelativePath.replace(/\\/g, '/').replace(/\.html$/, '');
-      // Special case: /index becomes /
-      if (url === '/index') {
-        url = '/';
+      let url;
+      const fileName = path.basename(outputRelativePath, '.html');
+      const basePath = path.dirname(outputRelativePath);
+
+      // Special case: index files remain at root, others become directories
+      if (fileName === 'index') {
+        url = basePath && basePath !== '.' ? '/' + basePath.replace(/\\/g, '/') : '/';
+        if (url !== '/') {
+          url = url + '/';
+        }
       } else {
-        // Add trailing slash for all non-root URLs
-        url = url + '/';
+        const pagePath = basePath && basePath !== '.' ? path.join(basePath, fileName) : fileName;
+        url = '/' + pagePath.replace(/\\/g, '/') + '/';
       }
 
       // Deep merge global data with frontmatter and collections for the page context
       const pageData = deepMerge(globalData, frontmatter);
       pageData.collections = collections;
       pageData.page = { url };
+      pageData.build = { isScreenshotMode };
 
       let processedPageContent;
 
@@ -298,9 +308,36 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
         htmlString = convertToHtml(resultArray);
       }
 
-      // Create output directory if it doesn't exist
-      const outputPath = path.join(rootDir, '_site', outputRelativePath);
-      const outputDir = path.dirname(outputPath);
+      // Create output directory and file path for new index.html structure
+      const pageFileName = path.basename(outputRelativePath, '.html');
+      const dirPath = path.dirname(outputRelativePath);
+
+      let outputPath, outputDir;
+
+      // Special case: index files remain as index.html, others become directory/index.html
+      if (pageFileName === 'index') {
+        if (dirPath && dirPath !== '.') {
+          // Nested index file: pages/blog/index.yaml -> _site/blog/index.html
+          outputPath = path.join(rootDir, '_site', dirPath, 'index.html');
+          outputDir = path.join(rootDir, '_site', dirPath);
+        } else {
+          // Root index file: pages/index.yaml -> _site/index.html
+          outputPath = path.join(rootDir, '_site', 'index.html');
+          outputDir = path.join(rootDir, '_site');
+        }
+      } else {
+        // Regular file: pages/test.yaml -> _site/test/index.html
+        if (dirPath && dirPath !== '.') {
+          // Nested regular file: pages/blog/post.yaml -> _site/blog/post/index.html
+          outputPath = path.join(rootDir, '_site', dirPath, pageFileName, 'index.html');
+          outputDir = path.join(rootDir, '_site', dirPath, pageFileName);
+        } else {
+          // Root level regular file: pages/test.yaml -> _site/test/index.html
+          outputPath = path.join(rootDir, '_site', pageFileName, 'index.html');
+          outputDir = path.join(rootDir, '_site', pageFileName);
+        }
+      }
+
       if (!fs.existsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
       }

package/src/screenshotRunner.js

@@ -141,9 +141,9 @@ const screenshotCommand = async (options = {}) => {
     console.log('📋 Ignore patterns:', ignorePatterns);
   }
 
-  // Build the site first
+  // Build the site first (with screenshot mode enabled)
   console.log('Building site...');
-  await buildSite({ rootDir });
+  await buildSite({ rootDir, isScreenshotMode: true });
   console.log('Build complete');
 
   // Start temporary server