@rettangoli/sites 0.2.0-rc7 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/sites",
-  "version": "0.2.0-rc7",
+  "version": "0.2.2",
   "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",
@@ -28,7 +28,8 @@
   },
   "devDependencies": {
     "memfs": "^4.36.0",
-    "puty": "^0.0.4"
+    "puty": "^0.0.4",
+    "vitest": "^3.2.4"
   },
   "scripts": {
     "test": "vitest run --reporter=verbose"

package/src/cli/build.js

@@ -21,10 +21,10 @@ export const buildSite = async (options = {}) => {
   const build = createSiteBuilder({
     fs,
     rootDir,
-    md: md || config.md,
+    md: md || config.mdRender,
     functions: functions || config.functions || {},
     quiet
   });
 
-  build();
+  await build();
 };

package/src/createSiteBuilder.js

@@ -32,7 +32,7 @@ function isObject(item) {
 }
 
 export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet = false }) {
-  return function build() {
+  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
@@ -191,7 +194,7 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
     const collections = buildCollections();
 
     // Function to process a single page file
-    function processPage(pagePath, outputRelativePath, isMarkdown = false) {
+    async function processPage(pagePath, outputRelativePath, isMarkdown = false) {
       if (!quiet) console.log(`Processing ${pagePath}...`);
 
       // Read page content
@@ -227,13 +230,19 @@ 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
@@ -245,7 +254,13 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
 
       if (isMarkdown) {
         // Process markdown content with MarkdownIt
-        const htmlContent = mdInstance.render(rawContent);
+        //If markdownit async then use the async render method
+        let htmlContent;
+        if(mdInstance.renderAsync){
+          htmlContent = await mdInstance.renderAsync(rawContent);
+        } else {
+          htmlContent = mdInstance.render(rawContent);
+        }
         // For markdown, store as raw HTML that will be inserted directly
         processedPageContent = { __html: htmlContent };
       } else {
@@ -292,9 +307,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 });
       }
@@ -305,7 +347,7 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
     }
 
     // Process all YAML and Markdown files in pages directory recursively
-    function processAllPages(dir, basePath = '') {
+    async function processAllPages(dir, basePath = '') {
       const pagesDir = path.join(rootDir, 'pages');
       const fullDir = path.join(pagesDir, basePath);
 
@@ -319,18 +361,18 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
 
         if (item.isDirectory()) {
           // Recursively process subdirectories
-          processAllPages(dir, relativePath);
+          await processAllPages(dir, relativePath);
         } else if (item.isFile()) {
           if (item.name.endsWith('.yaml')) {
             // Process YAML file
             const outputFileName = item.name.replace('.yaml', '.html');
             const outputRelativePath = basePath ? path.join(basePath, outputFileName) : outputFileName;
-            processPage(itemPath, outputRelativePath, false);
+            await processPage(itemPath, outputRelativePath, false);
           } else if (item.name.endsWith('.md')) {
             // Process Markdown file
             const outputFileName = item.name.replace('.md', '.html');
             const outputRelativePath = basePath ? path.join(basePath, outputFileName) : outputFileName;
-            processPage(itemPath, outputRelativePath, true);
+            await processPage(itemPath, outputRelativePath, true);
           }
           // Ignore other file types
         }
@@ -388,7 +430,7 @@ export function createSiteBuilder({ fs, rootDir = '.', md, functions = {}, quiet
     copyStaticFiles();
 
     // Process all pages (can overwrite static files)
-    processAllPages('');
+    await processAllPages('');
 
     if (!quiet) console.log('Build complete!');
   };