@terrymooreii/sia 2.3.1 → 2.3.3

package/docs/README.md

@@ -71,17 +71,26 @@ my-site/
 ├── _config.yml          # Site configuration
 ├── src/
 │   ├── posts/           # Blog posts (markdown)
-│   │   └── 2024-12-17-my-post/
-│   │       ├── index.md
-│   │       └── (assets can go here)
+│   │   ├── 2024-12-17-my-post/    # Flat structure (default)
+│   │   │   ├── index.md
+│   │   │   └── (assets can go here)
+│   │   └── 2024/                   # Or date-organized (if path: posts/:year/:month)
+│   │       └── 12/
+│   │           └── 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)
+│   │   ├── 2024-12-17-note-1234567890/  # Flat structure (default)
+│   │   │   ├── index.md
+│   │   │   └── (assets can go here)
+│   │   └── 2024/                    # Or date-organized (if path: notes/:year)
+│   │       └── 2024-12-17-note-1234567890/
+│   │           ├── index.md
+│   │           └── (assets can go here)
 │   └── images/          # Images
 ├── assets/              # Static assets (optional)
 ├── static/              # Static assets (optional)
@@ -97,10 +106,39 @@ my-site/
 
 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.
 
+**Note:** You can organize posts and notes by date using date variables in the `path` configuration (e.g., `posts/:year/:month`). See [Date Variables in Paths](#date-variables-in-paths) for details.
+
 ## Configuration
 
 Edit `_config.yml` to customize your site:
 
+### Date Variables in Paths
+
+You can organize posts and notes by date using date variables in the `path` property:
+
+```yaml
+collections:
+  posts:
+    path: posts/:year/:month    # Organizes posts by year and month
+    # New posts will be created in: posts/2024/01/2024-01-15-slug/
+  
+  notes:
+    path: notes/:year            # Organizes notes by year only
+    # New notes will be created in: notes/2024/2024-01-15-note-1234567890/
+```
+
+**Supported date variables:**
+- `:year` - 4-digit year (e.g., `2024`)
+- `:month` - 2-digit month (e.g., `01`, `12`)
+- `:day` - 2-digit day (e.g., `01`, `31`)
+
+**Examples:**
+- `posts/:year/:month` → `posts/2024/01/`
+- `posts/:year` → `posts/2024/`
+- `notes/:year/:month/:day` → `notes/2024/01/15/`
+
+When loading collections, Sia automatically searches recursively through all date-organized directories, so existing content will be found regardless of the path structure.
+
 ```yaml
 site:
   title: "My Blog"
@@ -117,7 +155,7 @@ output: dist
 
 collections:
   posts:
-    path: posts
+    path: posts              # Or use date variables: posts/:year/:month
     layout: post
     permalink: /blog/:slug/
     sortBy: date
@@ -127,7 +165,7 @@ collections:
     layout: page
     permalink: /:slug/
   notes:
-    path: notes
+    path: notes              # Or use date variables: notes/:year
     layout: note
     permalink: /notes/:slug/
 

package/docs/front-matter.md

@@ -165,13 +165,32 @@ Blog posts are stored in `src/posts/` (or your configured path).
 # From _config.yml
 collections:
   posts:
-    path: posts
+    path: posts              # Or use date variables: posts/:year/:month
     layout: post
     permalink: /blog/:slug/
     sortBy: date
     sortOrder: desc
 ```
 
+**Date Variables in Paths:**
+
+You can organize posts by date using date variables in the `path` property:
+
+```yaml
+collections:
+  posts:
+    path: posts/:year/:month    # Creates: posts/2024/01/2024-01-15-slug/
+    # Or
+    path: posts/:year            # Creates: posts/2024/2024-01-15-slug/
+```
+
+**Supported variables:**
+- `:year` - 4-digit year (e.g., `2024`)
+- `:month` - 2-digit month (e.g., `01`, `12`)
+- `:day` - 2-digit day (e.g., `01`, `31`)
+
+When you create a new post, it will be automatically placed in the correct date-organized directory based on the current date.
+
 ### Typical Post Front Matter
 
 ```yaml
@@ -268,13 +287,32 @@ Notes are short-form content stored in `src/notes/` (or your configured path). T
 # From _config.yml
 collections:
   notes:
-    path: notes
+    path: notes              # Or use date variables: notes/:year
     layout: note
     permalink: /notes/:slug/
     sortBy: date
     sortOrder: desc
 ```
 
+**Date Variables in Paths:**
+
+You can organize notes by date using date variables in the `path` property:
+
+```yaml
+collections:
+  notes:
+    path: notes/:year         # Creates: notes/2024/2024-01-15-note-1234567890/
+    # Or
+    path: notes/:year/:month  # Creates: notes/2024/01/2024-01-15-note-1234567890/
+```
+
+**Supported variables:**
+- `:year` - 4-digit year (e.g., `2024`)
+- `:month` - 2-digit month (e.g., `01`, `12`)
+- `:day` - 2-digit day (e.g., `01`, `31`)
+
+When you create a new note, it will be automatically placed in the correct date-organized directory based on the current date.
+
 ### Typical Note Front Matter
 
 Notes often have minimal front matter since they're short-form:

package/lib/content.js

@@ -321,6 +321,49 @@ function truncateMarkdownSafely(text, maxLength) {
   return text.substring(0, truncateAt).trim() + '...';
 }
 
+/**
+ * Expand date variables in a path template
+ * Supports :year, :month, :day variables
+ * @param {string} pathTemplate - Path template with date variables (e.g., "posts/:year/:month")
+ * @param {Date} date - Date to use for expansion
+ * @returns {string} Expanded path
+ */
+export function expandDatePath(pathTemplate, date) {
+  if (!pathTemplate || typeof pathTemplate !== 'string') {
+    return pathTemplate;
+  }
+  
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  
+  return pathTemplate
+    .replace(/:year/g, year)
+    .replace(/:month/g, month)
+    .replace(/:day/g, day);
+}
+
+/**
+ * Get base path from a path template (removes date variables for recursive searching)
+ * @param {string} pathTemplate - Path template with date variables
+ * @returns {string} Base path (everything before the first date variable)
+ */
+export function getBasePath(pathTemplate) {
+  if (!pathTemplate || typeof pathTemplate !== 'string') {
+    return pathTemplate;
+  }
+  
+  // Find the first occurrence of a date variable (can be at start or after a slash)
+  const firstVariable = pathTemplate.match(/:(\w+)/);
+  if (!firstVariable) {
+    // No date variables, return as-is
+    return pathTemplate;
+  }
+  
+  // Return everything before the first date variable
+  return pathTemplate.substring(0, firstVariable.index);
+}
+
 /**
  * Generate a URL-friendly slug from a string
  */
@@ -402,10 +445,66 @@ export function getDateFromFilename(filename) {
   return null;
 }
 
+/**
+ * Convert relative image and link paths to absolute paths based on base URL
+ * @param {string} html - HTML content with potential relative paths
+ * @param {string} baseUrl - Base URL for the content item (e.g., '/blog/my-post/')
+ * @returns {string} HTML with absolute paths
+ */
+function fixRelativePaths(html, baseUrl) {
+  if (!html || !baseUrl) return html;
+  
+  // Normalize baseUrl to ensure it ends with a slash
+  const normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
+  
+  // Helper function to convert relative path to absolute
+  const makeAbsolute = (path) => {
+    // Skip if it's already an absolute URL (http://, https://) or absolute path (/)
+    if (/^(https?:|\/|#|mailto:)/.test(path)) {
+      return path;
+    }
+    
+    // Convert relative path to absolute path
+    // Remove leading ./ if present
+    const cleanPath = path.replace(/^\.\//, '');
+    
+    // Combine base URL with path
+    return normalizedBaseUrl + cleanPath;
+  };
+  
+  // Fix relative image paths
+  html = html.replace(
+    /<img\s+([^>]*?)(?:src\s*=\s*(["'])([^"']+)\2)([^>]*)>/gi,
+    (match, beforeAttrs, quote, src, afterAttrs) => {
+      const absolutePath = makeAbsolute(src);
+      
+      // Reconstruct the img tag with the absolute path
+      const before = beforeAttrs ? beforeAttrs.trim() + ' ' : '';
+      const after = afterAttrs ? ' ' + afterAttrs.trim() : '';
+      return `<img ${before}src=${quote}${absolutePath}${quote}${after}>`;
+    }
+  );
+  
+  // Fix relative link paths (but skip anchor links and external URLs)
+  html = html.replace(
+    /<a\s+([^>]*?)(?:href\s*=\s*(["'])([^"']+)\2)([^>]*)>/gi,
+    (match, beforeAttrs, quote, href, afterAttrs) => {
+      const absolutePath = makeAbsolute(href);
+      
+      // Reconstruct the link tag with the absolute path
+      const before = beforeAttrs ? beforeAttrs.trim() + ' ' : '';
+      const after = afterAttrs ? ' ' + afterAttrs.trim() : '';
+      return `<a ${before}href=${quote}${absolutePath}${quote}${after}>`;
+    }
+  );
+  
+  return html;
+}
+
 /**
  * Parse a markdown file with front matter
  */
-export async function parseContent(filePath) {
+export async function parseContent(filePath, options = {}) {
   let content = readFileSync(filePath, 'utf-8');
   
   // Execute beforeParse hook
@@ -521,7 +620,11 @@ export async function loadCollection(config, collectionName) {
     return [];
   }
   
-  const collectionDir = join(config.inputDir, collectionConfig.path);
+  // If path contains date variables, use base path for recursive searching
+  // Otherwise use the path as-is
+  const pathTemplate = collectionConfig.path;
+  const basePath = getBasePath(pathTemplate);
+  const collectionDir = join(config.inputDir, basePath);
   const files = getMarkdownFiles(collectionDir);
   
   const items = await Promise.all(
@@ -546,6 +649,11 @@ export async function loadCollection(config, collectionName) {
         item.url = basePath + permalink;
         item.outputPath = join(config.outputDir, permalink, 'index.html');
         
+        // Fix relative image and link paths in content and excerptHtml
+        // This ensures images and links work on both individual pages and list pages
+        item.content = fixRelativePaths(item.content, item.url);
+        item.excerptHtml = fixRelativePaths(item.excerptHtml, item.url);
+        
         return item;
       } catch (err) {
         console.error(`Error parsing ${filePath}:`, err.message);
@@ -610,6 +718,8 @@ export default {
   getMarkdownFiles,
   loadCollection,
   loadAllCollections,
-  addMarkedExtension
+  addMarkedExtension,
+  expandDatePath,
+  getBasePath
 };
 

package/lib/migrate.js

@@ -1,7 +1,7 @@
 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';
+import { getMarkdownFiles, getBasePath } from './content.js';
 
 /**
  * Check if a file is already in folder-based structure
@@ -102,7 +102,10 @@ export async function migrateContent(options = {}) {
       continue;
     }
     
-    const collectionDir = join(config.inputDir, collectionConfig.path);
+    // If path contains date variables, use base path for recursive searching
+    const pathTemplate = collectionConfig.path;
+    const basePath = getBasePath(pathTemplate);
+    const collectionDir = join(config.inputDir, basePath);
     
     if (!existsSync(collectionDir)) {
       console.log(`⚠️  Collection directory not found: ${collectionDir}`);

package/lib/new.js

@@ -2,7 +2,7 @@ import prompts from 'prompts';
 import { writeFileSync, existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import { loadConfig } from './config.js';
-import { slugify } from './content.js';
+import { slugify, expandDatePath } from './content.js';
 
 /**
  * Get current date in YYYY-MM-DD format
@@ -52,7 +52,10 @@ function createPost(config, options) {
   const slug = slugify(options.title);
   const date = getDateString();
   const folderName = `${date}-${slug}`;
-  const postsDir = join(config.inputDir, config.collections.posts?.path || 'posts');
+  const now = new Date();
+  const pathTemplate = config.collections.posts?.path || 'posts';
+  const expandedPath = expandDatePath(pathTemplate, now);
+  const postsDir = join(config.inputDir, expandedPath);
   const postFolder = join(postsDir, folderName);
   const filePath = join(postFolder, 'index.md');
   
@@ -129,7 +132,10 @@ function createNote(config, options) {
   const date = getDateString();
   const timestamp = Date.now();
   const folderName = `${date}-${slug}-${timestamp}`;
-  const notesDir = join(config.inputDir, config.collections.notes?.path || 'notes');
+  const now = new Date();
+  const pathTemplate = config.collections.notes?.path || 'notes';
+  const expandedPath = expandDatePath(pathTemplate, now);
+  const notesDir = join(config.inputDir, expandedPath);
   const noteFolder = join(notesDir, folderName);
   const filePath = join(noteFolder, 'index.md');
   

package/package.json

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