@terrymooreii/sia 2.1.13 → 2.2.0

package/bin/cli.js

@@ -15,6 +15,7 @@ import { buildCommand } from '../lib/build.js';
 import { newCommand } from '../lib/new.js';
 import { initCommand } from '../lib/init.js';
 import { themeCommand } from '../lib/theme.js';
+import { migrateCommand } from '../lib/migrate.js';
 
 program
   .name('sia')
@@ -54,5 +55,11 @@ program
   .option('-q, --quick', 'Skip prompts and use defaults')
   .action(themeCommand);
 
+program
+  .command('migrate')
+  .description('Migrate standalone .md files to folder-based structure (folder/index.md)')
+  .option('--dry-run', 'Preview changes without applying them', false)
+  .action(migrateCommand);
+
 program.parse();
 

package/docs/README.md

@@ -68,8 +68,17 @@ my-site/
 ├── _config.yml          # Site configuration
 ├── src/
 │   ├── posts/           # Blog posts (markdown)
+│   │   └── 2024-12-17-my-post/
+│   │       ├── index.md
+│   │       └── (assets can go here)
 │   ├── pages/           # Static pages
+│   │   └── about/
+│   │       ├── index.md
+│   │       └── (assets can go here)
 │   ├── notes/           # Short notes/tweets
+│   │   └── 2024-12-17-note-1234567890/
+│   │       ├── index.md
+│   │       └── (assets can go here)
 │   └── images/          # Images
 ├── assets/              # Static assets (optional)
 ├── static/              # Static assets (optional)
@@ -81,6 +90,8 @@ my-site/
 └── dist/                # Generated output
 ```
 
+Each post, page, and note is created as a folder containing an `index.md` file. This allows you to organize assets (images, PDFs, etc.) alongside your content in the same folder.
+
 ## Configuration
 
 Edit `_config.yml` to customize your site:

package/docs/front-matter.md

@@ -366,19 +366,27 @@ permalink: /featured/special-post/
 
 ## Date from Filename
 
-Sia can extract dates from filenames using this pattern:
+Sia can extract dates from filenames (or folder names when using `index.md`) using this pattern:
 
 ```
 YYYY-MM-DD-slug.md
 ```
 
+or for folder-based content:
+
+```
+YYYY-MM-DD-slug/index.md
+```
+
 ### Examples
 
-| Filename | Extracted Date | Extracted Slug |
-|----------|----------------|----------------|
-| `2024-12-17-my-post.md` | December 17, 2024 | `my-post` |
-| `2024-01-05-new-year.md` | January 5, 2024 | `new-year` |
-| `about.md` | Current date | `about` |
+| Filename/Folder | Extracted Date | Extracted Slug |
+|-----------------|----------------|----------------|
+| `2024-12-17-my-post/index.md` | December 17, 2024 | `my-post` |
+| `2024-01-05-new-year/index.md` | January 5, 2024 | `new-year` |
+| `about/index.md` | Current date | `about` |
+| `2024-12-17-my-post.md` | December 17, 2024 | `my-post` (backward compatible) |
+| `about.md` | Current date | `about` (backward compatible) |
 
 ### Priority
 
@@ -391,8 +399,8 @@ Date resolution follows this priority:
 Slug resolution:
 
 1. `slug` in front matter (highest priority)
-2. Slug extracted from filename (after date prefix)
-3. Slugified filename
+2. Slug extracted from filename or folder name (after date prefix if present)
+3. Slugified filename or folder name
 
 ---
 

package/lib/assets.js

@@ -9,7 +9,7 @@ import {
   unlinkSync,
   rmdirSync
 } from 'fs';
-import { join, dirname, relative, extname } from 'path';
+import { join, dirname, relative, extname, basename } from 'path';
 import { resolveTheme, getBuiltInThemesDir } from './theme-resolver.js';
 
 // Supported asset extensions
@@ -115,6 +115,40 @@ export function copyImages(config) {
   return copied;
 }
 
+/**
+ * Copy assets from a content folder to the output directory
+ * @param {string} contentFolderPath - Path to the content folder (e.g., src/posts/2024-12-17-my-post/)
+ * @param {string} outputDir - Output directory for this content item (e.g., dist/blog/my-post/)
+ * @returns {number} Number of assets copied
+ */
+export function copyContentAssets(contentFolderPath, outputDir) {
+  if (!existsSync(contentFolderPath)) {
+    return 0;
+  }
+  
+  const files = getAllFiles(contentFolderPath);
+  let copied = 0;
+  
+  for (const file of files) {
+    // Skip the index.md file itself
+    const fileName = basename(file);
+    if (fileName === 'index.md' || fileName === 'index.markdown') {
+      continue;
+    }
+    
+    // Only copy asset files
+    if (isAsset(file)) {
+      const relativePath = relative(contentFolderPath, file);
+      const destPath = join(outputDir, relativePath);
+      
+      copyFile(file, destPath);
+      copied++;
+    }
+  }
+  
+  return copied;
+}
+
 /**
  * Check if directory has CSS files
  */
@@ -321,6 +355,7 @@ export default {
   copyFile,
   copyAssets,
   copyImages,
+  copyContentAssets,
   copyDefaultStyles,
   copyStaticAssets,
   copyCustomAssets,

package/lib/build.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
 import { loadConfig } from './config.js';
 import { buildSiteData, paginate, getPaginationUrls } from './collections.js';
 import { createTemplateEngine, renderTemplate } from './templates.js';
-import { copyImages, copyDefaultStyles, copyStaticAssets, copyCustomAssets, writeFile, ensureDir } from './assets.js';
+import { copyImages, copyDefaultStyles, copyStaticAssets, copyCustomAssets, copyContentAssets, writeFile, ensureDir } from './assets.js';
 import { resolveTheme } from './theme-resolver.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -35,6 +35,11 @@ function renderContentItem(env, item, siteData) {
   });
   
   writeFile(item.outputPath, html);
+  
+  // Copy assets from content folder to output directory
+  const contentFolder = dirname(item.filePath);
+  const outputDir = dirname(item.outputPath);
+  return copyContentAssets(contentFolder, outputDir);
 }
 
 /**
@@ -231,16 +236,22 @@ export async function build(options = {}) {
   
   // Render all content items
   let itemCount = 0;
+  let totalContentAssets = 0;
   
   for (const [collectionName, items] of Object.entries(siteData.collections)) {
     for (const item of items) {
-      renderContentItem(env, item, siteData);
+      const assetsCopied = renderContentItem(env, item, siteData);
+      totalContentAssets += assetsCopied;
       itemCount++;
     }
   }
   
   console.log(`📄 Generated ${itemCount} content pages`);
   
+  if (totalContentAssets > 0) {
+    console.log(`📦 Copied ${totalContentAssets} asset(s) from content folders`);
+  }
+  
   // Render listing pages
   renderHomepage(env, siteData);
   renderBlogListing(env, siteData);

package/lib/content.js

@@ -1,5 +1,5 @@
 import { readFileSync, readdirSync, statSync, existsSync } from 'fs';
-import { join, basename, extname, relative } from 'path';
+import { join, basename, extname, dirname } from 'path';
 import matter from 'gray-matter';
 import { Marked } from 'marked';
 import { markedHighlight } from 'marked-highlight';
@@ -326,11 +326,28 @@ export function slugify(str) {
 
 /**
  * Extract slug from filename (removes date prefix if present)
+ * If the file is index.md, extracts from parent directory name instead
  */
 export function getSlugFromFilename(filename) {
   // Remove extension
   const name = basename(filename, extname(filename));
   
+  // If file is index.md, extract from parent directory name
+  if (name === 'index') {
+    const parentDir = dirname(filename);
+    const parentDirName = basename(parentDir);
+    
+    // Check for date prefix pattern: YYYY-MM-DD-slug
+    const datePattern = /^\d{4}-\d{2}-\d{2}-(.+)$/;
+    const match = parentDirName.match(datePattern);
+    
+    if (match) {
+      return match[1];
+    }
+    
+    return slugify(parentDirName);
+  }
+  
   // Check for date prefix pattern: YYYY-MM-DD-slug
   const datePattern = /^\d{4}-\d{2}-\d{2}-(.+)$/;
   const match = name.match(datePattern);
@@ -344,9 +361,27 @@ export function getSlugFromFilename(filename) {
 
 /**
  * Extract date from filename if present
+ * If the file is index.md, extracts from parent directory name instead
  */
 export function getDateFromFilename(filename) {
   const name = basename(filename, extname(filename));
+  
+  // If file is index.md, extract from parent directory name
+  if (name === 'index') {
+    const parentDir = dirname(filename);
+    const parentDirName = basename(parentDir);
+    const datePattern = /^(\d{4}-\d{2}-\d{2})/;
+    const match = parentDirName.match(datePattern);
+    
+    if (match) {
+      // Parse as local date, not UTC
+      const [year, month, day] = match[1].split('-').map(Number);
+      return new Date(year, month - 1, day);
+    }
+    
+    return null;
+  }
+  
   const datePattern = /^(\d{4}-\d{2}-\d{2})/;
   const match = name.match(datePattern);
   

package/lib/migrate.js

@@ -0,0 +1,180 @@
+import { readdirSync, statSync, existsSync, mkdirSync, renameSync } from 'fs';
+import { join, dirname, basename, extname } from 'path';
+import { loadConfig } from './config.js';
+import { getMarkdownFiles } from './content.js';
+
+/**
+ * Check if a file is already in folder-based structure
+ */
+function isAlreadyMigrated(filePath) {
+  try {
+    const name = basename(filePath, extname(filePath));
+    const parentDir = dirname(filePath);
+    // Check if file is index.md and parent is a directory (not the collection root)
+    return name === 'index' && statSync(parentDir).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Check if a file is a standalone .md file (needs migration)
+ * Returns true if file is directly in collection directory (not in subdirectory)
+ */
+function needsMigration(filePath, collectionDir) {
+  // Normalize paths for comparison
+  const normalizedFilePath = filePath.replace(/\\/g, '/');
+  const normalizedCollectionDir = collectionDir.replace(/\\/g, '/');
+  
+  // Get relative path from collection directory
+  const relativePath = normalizedFilePath.replace(normalizedCollectionDir + '/', '');
+  
+  // If relative path contains no slashes, it's directly in collection dir
+  // Also check it's not already index.md in a folder
+  const isStandalone = !relativePath.includes('/');
+  const isNotIndex = basename(filePath, extname(filePath)) !== 'index';
+  
+  return isStandalone && isNotIndex;
+}
+
+/**
+ * Migrate a single file to folder structure
+ */
+function migrateFile(filePath, collectionDir, dryRun = false) {
+  const fileName = basename(filePath);
+  const nameWithoutExt = basename(filePath, extname(filePath));
+  const newFolder = join(collectionDir, nameWithoutExt);
+  const newFilePath = join(newFolder, 'index.md');
+  
+  // Skip if already migrated
+  if (isAlreadyMigrated(filePath)) {
+    return { status: 'skipped', reason: 'already_migrated', file: filePath };
+  }
+  
+  // Skip if target folder already exists
+  if (existsSync(newFolder)) {
+    return { status: 'skipped', reason: 'folder_exists', file: filePath, folder: newFolder };
+  }
+  
+  if (dryRun) {
+    return { status: 'would_migrate', from: filePath, to: newFilePath };
+  }
+  
+  try {
+    // Create folder
+    mkdirSync(newFolder, { recursive: true });
+    
+    // Move file to new location
+    renameSync(filePath, newFilePath);
+    
+    return { status: 'migrated', from: filePath, to: newFilePath };
+  } catch (error) {
+    return { status: 'error', file: filePath, error: error.message };
+  }
+}
+
+/**
+ * Migrate all content files to folder structure
+ */
+export async function migrateContent(options = {}) {
+  const {
+    dryRun = false,
+    rootDir = process.cwd()
+  } = options;
+  
+  const config = loadConfig(rootDir);
+  const collections = ['posts', 'pages', 'notes'];
+  const results = {
+    migrated: [],
+    skipped: [],
+    errors: []
+  };
+  
+  console.log('\n🔄 Content Migration Tool\n');
+  
+  if (dryRun) {
+    console.log('⚠️  DRY RUN MODE - No files will be modified\n');
+  }
+  
+  for (const collectionName of collections) {
+    const collectionConfig = config.collections[collectionName];
+    if (!collectionConfig) {
+      continue;
+    }
+    
+    const collectionDir = join(config.inputDir, collectionConfig.path);
+    
+    if (!existsSync(collectionDir)) {
+      console.log(`⚠️  Collection directory not found: ${collectionDir}`);
+      continue;
+    }
+    
+    console.log(`📁 Processing ${collectionName} collection...`);
+    
+    // Get all markdown files in the collection directory
+    const allFiles = getMarkdownFiles(collectionDir);
+    
+    // Filter to only standalone files (not already in folders)
+    const filesToMigrate = allFiles.filter(filePath => {
+      return needsMigration(filePath, collectionDir);
+    });
+    
+    if (filesToMigrate.length === 0) {
+      console.log(`   No files to migrate in ${collectionName} collection\n`);
+      continue;
+    }
+    
+    console.log(`   Found ${filesToMigrate.length} file(s) to migrate`);
+    
+    for (const filePath of filesToMigrate) {
+      const result = migrateFile(filePath, collectionDir, dryRun);
+      
+      if (result.status === 'migrated' || result.status === 'would_migrate') {
+        results.migrated.push(result);
+        const folderName = basename(dirname(result.to));
+        console.log(`   ✓ ${basename(filePath)} → ${folderName}/index.md`);
+      } else if (result.status === 'skipped') {
+        results.skipped.push(result);
+        const reason = result.reason === 'already_migrated' 
+          ? 'already in folder structure' 
+          : 'target folder exists';
+        console.log(`   ⊘ Skipped: ${basename(filePath)} (${reason})`);
+      } else {
+        results.errors.push(result);
+        console.error(`   ✗ Error: ${basename(filePath)} - ${result.error}`);
+      }
+    }
+    
+    console.log('');
+  }
+  
+  // Print summary
+  console.log('='.repeat(50));
+  console.log('Migration Summary:');
+  console.log(`  ✓ Migrated: ${results.migrated.length}`);
+  console.log(`  ⊘ Skipped: ${results.skipped.length}`);
+  console.log(`  ✗ Errors: ${results.errors.length}`);
+  console.log('='.repeat(50));
+  
+  if (dryRun) {
+    console.log('\n⚠️  This was a dry run. No files were actually moved.');
+    console.log('   Run without --dry-run to apply changes.\n');
+  } else if (results.migrated.length > 0) {
+    console.log('\n✨ Migration complete! Your content is now in folder-based structure.\n');
+  }
+  
+  return results;
+}
+
+/**
+ * Migration command handler for CLI
+ */
+export async function migrateCommand(options = {}) {
+  await migrateContent({
+    dryRun: options.dryRun === true,
+    rootDir: process.cwd()
+  });
+}
+
+export default { migrateContent, migrateCommand };
+

package/lib/new.js

@@ -51,14 +51,18 @@ function formatTags(tags) {
 function createPost(config, options) {
   const slug = slugify(options.title);
   const date = getDateString();
-  const filename = `${date}-${slug}.md`;
+  const folderName = `${date}-${slug}`;
   const postsDir = join(config.inputDir, config.collections.posts?.path || 'posts');
-  const filePath = join(postsDir, filename);
+  const postFolder = join(postsDir, folderName);
+  const filePath = join(postFolder, 'index.md');
   
-  // Ensure directory exists
+  // Ensure directories exist
   if (!existsSync(postsDir)) {
     mkdirSync(postsDir, { recursive: true });
   }
+  if (!existsSync(postFolder)) {
+    mkdirSync(postFolder, { recursive: true });
+  }
   
   let frontMatter = `---
 title: "${options.title}"
@@ -87,14 +91,18 @@ ${options.content || 'Write your post content here...'}
  */
 function createPage(config, options) {
   const slug = slugify(options.title);
-  const filename = `${slug}.md`;
+  const folderName = slug;
   const pagesDir = join(config.inputDir, config.collections.pages?.path || 'pages');
-  const filePath = join(pagesDir, filename);
+  const pageFolder = join(pagesDir, folderName);
+  const filePath = join(pageFolder, 'index.md');
   
-  // Ensure directory exists
+  // Ensure directories exist
   if (!existsSync(pagesDir)) {
     mkdirSync(pagesDir, { recursive: true });
   }
+  if (!existsSync(pageFolder)) {
+    mkdirSync(pageFolder, { recursive: true });
+  }
   
   let frontMatter = `---
 title: "${options.title}"
@@ -120,14 +128,18 @@ function createNote(config, options) {
   const slug = options.title ? slugify(options.title) : 'note';
   const date = getDateString();
   const timestamp = Date.now();
-  const filename = `${date}-${slug}-${timestamp}.md`;
+  const folderName = `${date}-${slug}-${timestamp}`;
   const notesDir = join(config.inputDir, config.collections.notes?.path || 'notes');
-  const filePath = join(notesDir, filename);
+  const noteFolder = join(notesDir, folderName);
+  const filePath = join(noteFolder, 'index.md');
   
-  // Ensure directory exists
+  // Ensure directories exist
   if (!existsSync(notesDir)) {
     mkdirSync(notesDir, { recursive: true });
   }
+  if (!existsSync(noteFolder)) {
+    mkdirSync(noteFolder, { recursive: true });
+  }
   
   const content = `---
 date: ${getISODate()}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrymooreii/sia",
-  "version": "2.1.13",
+  "version": "2.2.0",
   "description": "A simple, powerful static site generator with markdown, front matter, and Nunjucks templates",
   "main": "lib/index.js",
   "bin": {

package/readme.md

@@ -66,7 +66,7 @@ The output will be in the `dist/` folder, ready to deploy to any static hosting.
 npx sia new post "My Post Title"
 ```
 
-Creates a new markdown file in `src/posts/` with front matter template.
+Creates a new folder `src/posts/YYYY-MM-DD-my-post-title/` with an `index.md` file inside. You can organize assets (images, PDFs, etc.) in the same folder.
 
 ### New Page
 
@@ -74,7 +74,7 @@ Creates a new markdown file in `src/posts/` with front matter template.
 npx sia new page "About Me"
 ```
 
-Creates a new page in `src/pages/`.
+Creates a new folder `src/pages/about-me/` with an `index.md` file inside. You can organize assets in the same folder.
 
 ### New Note
 
@@ -82,7 +82,7 @@ Creates a new page in `src/pages/`.
 npx sia new note "Quick thought"
 ```
 
-Creates a short note in `src/notes/`.
+Creates a new folder `src/notes/YYYY-MM-DD-quick-thought-TIMESTAMP/` with an `index.md` file inside. You can organize assets in the same folder.
 
 ## Project Structure
 
@@ -91,8 +91,17 @@ my-site/
 ├── _config.yml          # Site configuration
 ├── src/
 │   ├── posts/           # Blog posts (markdown)
+│   │   └── 2024-12-17-my-post/
+│   │       ├── index.md
+│   │       └── (assets can go here)
 │   ├── pages/           # Static pages
+│   │   └── about/
+│   │       ├── index.md
+│   │       └── (assets can go here)
 │   ├── notes/           # Short notes/tweets
+│   │   └── 2024-12-17-note-1234567890/
+│   │       ├── index.md
+│   │       └── (assets can go here)
 │   └── images/          # Images
 ├── assets/              # Static assets (optional)
 ├── static/              # Static assets (optional)
@@ -104,6 +113,8 @@ my-site/
 └── dist/                # Generated output
 ```
 
+Each post, page, and note is created as a folder containing an `index.md` file. This allows you to organize assets (images, PDFs, etc.) alongside your content in the same folder.
+
 ## Configuration
 
 Edit `_config.yml` to customize your site: