@terrymooreii/sia 2.1.5 → 2.1.7

package/lib/content.js

@@ -247,6 +247,72 @@ marked.use({
   }
 });
 
+/**
+ * Safely truncate markdown text without breaking inline formatting
+ * Avoids cutting in the middle of links, bold, italic, code, images, etc.
+ */
+function truncateMarkdownSafely(text, maxLength) {
+  if (text.length <= maxLength) {
+    return text;
+  }
+  
+  // Find all inline markdown element ranges to avoid cutting inside them
+  const inlinePatterns = [
+    /!\[([^\]]*)\]\([^)]*\)/g,  // Images ![alt](url) - must come before links
+    /\[([^\]]*)\]\([^)]*\)/g,   // Links [text](url)
+    /\[([^\]]*)\]\[[^\]]*\]/g,  // Reference links [text][ref]
+    /\*\*([^*]+)\*\*/g,         // Bold **text**
+    /__([^_]+)__/g,             // Bold __text__
+    /\*([^*\n]+)\*/g,           // Italic *text*
+    /_([^_\n]+)_/g,             // Italic _text_
+    /`([^`]+)`/g,               // Inline code `code`
+    /~~([^~]+)~~/g,             // Strikethrough ~~text~~
+  ];
+  
+  // Collect all ranges where inline elements exist
+  const ranges = [];
+  for (const pattern of inlinePatterns) {
+    let match;
+    // Reset lastIndex for each pattern
+    pattern.lastIndex = 0;
+    while ((match = pattern.exec(text)) !== null) {
+      ranges.push({ start: match.index, end: match.index + match[0].length });
+    }
+  }
+  
+  // Sort ranges by start position
+  ranges.sort((a, b) => a.start - b.start);
+  
+  // Find the best truncation point
+  let truncateAt = maxLength;
+  
+  // Check if our target position is inside any markdown element
+  for (const range of ranges) {
+    if (truncateAt > range.start && truncateAt < range.end) {
+      // We're inside this element - decide whether to include it or exclude it
+      if (range.end <= maxLength + 50) {
+        // Include the whole element if it doesn't extend too far past our limit
+        truncateAt = range.end;
+      } else {
+        // Otherwise, truncate before this element starts
+        truncateAt = range.start;
+      }
+      break;
+    }
+  }
+  
+  // Try to break at a word boundary for cleaner excerpts
+  if (truncateAt > 0) {
+    const lastSpace = text.lastIndexOf(' ', truncateAt);
+    // Only use word boundary if it's reasonably close to our target
+    if (lastSpace > truncateAt - 30 && lastSpace > maxLength * 0.5) {
+      truncateAt = lastSpace;
+    }
+  }
+  
+  return text.substring(0, truncateAt).trim() + '...';
+}
+
 /**
  * Generate a URL-friendly slug from a string
  */
@@ -321,12 +387,17 @@ export function parseContent(filePath) {
   if (!excerpt) {
     const firstParagraph = markdown.split('\n\n')[0];
     excerpt = firstParagraph.replace(/^#+\s+.+\n?/, '').trim();
-    // Limit excerpt length
+    // Limit excerpt length using safe truncation that preserves markdown syntax
     if (excerpt.length > 200) {
-      excerpt = excerpt.substring(0, 197) + '...';
+      excerpt = truncateMarkdownSafely(excerpt, 200);
     }
   }
   
+  // Create HTML version of excerpt for templates that need rendered output
+  let excerptHtml = marked.parse(excerpt);
+  // Clean up the HTML (remove wrapping <p> tags for inline use)
+  excerptHtml = excerptHtml.replace(/^<p>/, '').replace(/<\/p>\n?$/, '');
+  
   // Normalize tags to array
   let tags = frontMatter.tags || [];
   if (typeof tags === 'string') {
@@ -338,6 +409,7 @@ export function parseContent(filePath) {
     slug,
     date,
     excerpt,
+    excerptHtml,
     tags,
     content: html,
     rawContent: markdown,

package/lib/init.js

@@ -87,7 +87,7 @@ Welcome to my new blog! This is my first post.
 
 ## About This Site
 
-This site is built with [Sia](https://github.com/sia/sia), a simple and powerful static site generator.
+This site is built with [Sia](https://github.com/terrymooreii/sia), a simple and powerful static site generator.
 
 ## What's Next?
 
@@ -114,7 +114,7 @@ Hello! I'm ${author}. Welcome to my corner of the internet.
 
 ## About This Site
 
-This site is built with [Sia](https://github.com/sia/sia), a simple static site generator that supports:
+This site is built with [Sia](https://github.com/terrymooreii/sia), a simple static site generator that supports:
 
 - Markdown with front matter
 - Blog posts, pages, and notes
@@ -216,7 +216,7 @@ Then upload the \`dist/\` folder to any static hosting.
 
   return `# ${title}
 
-A static site built with [Sia](https://github.com/sia/sia).
+A static site built with [Sia](https://github.com/terrymooreii/sia).
 
 ## Getting Started
 

package/lib/templates.js

@@ -2,6 +2,7 @@ import nunjucks from 'nunjucks';
 import { join, dirname } from 'path';
 import { existsSync } from 'fs';
 import { fileURLToPath } from 'url';
+import { resolveTheme, getBuiltInThemesDir } from './theme-resolver.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -12,7 +13,8 @@ const __dirname = dirname(__filename);
 function dateFilter(date, format = 'long') {
   if (!date) return '';
   
-  const d = new Date(date);
+  // Handle special "now" keyword for current date/time
+  const d = (date === 'now') ? new Date() : new Date(date);
   
   if (isNaN(d.getTime())) return '';
   
@@ -189,8 +191,11 @@ function createUrlFilter(basePath) {
 
 /**
  * Create and configure the Nunjucks environment
+ * 
+ * @param {object} config - Site configuration
+ * @param {object} [resolvedTheme] - Pre-resolved theme info from resolveTheme()
  */
-export function createTemplateEngine(config) {
+export function createTemplateEngine(config, resolvedTheme = null) {
   // Set up template paths - user layouts first, then defaults
   const templatePaths = [];
   
@@ -204,15 +209,18 @@ export function createTemplateEngine(config) {
     templatePaths.push(config.includesDir);
   }
   
-  // Default templates from the selected theme
-  const themeName = config.theme || 'main';
-  const themeDir = join(__dirname, '..', 'themes', themeName);
+  // Resolve theme if not already resolved
+  const themeName = config.theme?.name || 'main';
+  const theme = resolvedTheme || resolveTheme(themeName, config.rootDir);
+  const themeDir = theme.themeDir;
+  
+  // Add theme template paths
   templatePaths.push(join(themeDir, 'layouts'));
   templatePaths.push(join(themeDir, 'includes'));
   templatePaths.push(join(themeDir, 'pages'));
   
   // Shared includes available to all themes
-  const sharedIncludesDir = join(__dirname, '..', 'themes', '_shared', 'includes');
+  const sharedIncludesDir = join(getBuiltInThemesDir(), '_shared', 'includes');
   templatePaths.push(sharedIncludesDir);
   
   // Create the environment

package/lib/theme-resolver.js

@@ -0,0 +1,175 @@
+import { existsSync, readFileSync, readdirSync, statSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Built-in themes directory
+const builtInThemesDir = join(__dirname, '..', 'themes');
+
+/**
+ * Resolve the path to a theme directory
+ * 
+ * Resolution order:
+ * 1. Check built-in themes folder (sia's themes/)
+ * 2. Check for npm package sia-theme-{name}
+ * 3. Fall back to 'main' theme
+ * 
+ * @param {string} themeName - The theme name from config
+ * @param {string} rootDir - The user's project root directory
+ * @returns {{ themeDir: string, themeName: string, isExternal: boolean }}
+ */
+export function resolveTheme(themeName, rootDir = process.cwd()) {
+  // 1. Check built-in themes folder
+  const builtInThemeDir = join(builtInThemesDir, themeName);
+  if (existsSync(builtInThemeDir)) {
+    return {
+      themeDir: builtInThemeDir,
+      themeName,
+      isExternal: false
+    };
+  }
+
+  // 2. Check for npm package sia-theme-{name}
+  const packageName = `sia-theme-${themeName}`;
+  const externalThemeDir = resolveExternalTheme(packageName, rootDir);
+  
+  if (externalThemeDir) {
+    console.log(`🎨 Using external theme package: ${packageName}`);
+    return {
+      themeDir: externalThemeDir,
+      themeName,
+      isExternal: true
+    };
+  }
+
+  // 3. Fall back to 'main' theme
+  if (themeName !== 'main') {
+    console.log(`⚠️  Theme "${themeName}" not found, falling back to "main" theme`);
+  }
+  
+  return {
+    themeDir: join(builtInThemesDir, 'main'),
+    themeName: 'main',
+    isExternal: false
+  };
+}
+
+/**
+ * Attempt to resolve an external theme package
+ * 
+ * @param {string} packageName - The npm package name (sia-theme-{name})
+ * @param {string} rootDir - The user's project root directory
+ * @returns {string|null} The theme directory path or null if not found
+ */
+function resolveExternalTheme(packageName, rootDir) {
+  // First, check if the package is in the user's package.json
+  const packageJsonPath = join(rootDir, 'package.json');
+  
+  if (!existsSync(packageJsonPath)) {
+    return null;
+  }
+
+  try {
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+    const allDeps = {
+      ...packageJson.dependencies,
+      ...packageJson.devDependencies
+    };
+
+    // Check if the theme package is listed as a dependency
+    if (!allDeps[packageName]) {
+      return null;
+    }
+
+    // Try to resolve the package path
+    // Use createRequire to resolve from the user's project directory
+    const require = createRequire(join(rootDir, 'package.json'));
+    
+    try {
+      // Try to resolve the package's main entry point
+      const packageMainPath = require.resolve(packageName);
+      const packageDir = dirname(packageMainPath);
+      
+      // The theme directory is typically the package root
+      // Check if it has the expected theme structure
+      if (isValidThemeDirectory(packageDir)) {
+        return packageDir;
+      }
+      
+      // Sometimes the main entry is in a subdirectory, try parent
+      const parentDir = dirname(packageDir);
+      if (isValidThemeDirectory(parentDir)) {
+        return parentDir;
+      }
+
+      // Try node_modules directly
+      const nodeModulesPath = join(rootDir, 'node_modules', packageName);
+      if (existsSync(nodeModulesPath) && isValidThemeDirectory(nodeModulesPath)) {
+        return nodeModulesPath;
+      }
+
+      return null;
+    } catch (resolveErr) {
+      // Package might not be installed yet
+      // Try node_modules directly as fallback
+      const nodeModulesPath = join(rootDir, 'node_modules', packageName);
+      if (existsSync(nodeModulesPath) && isValidThemeDirectory(nodeModulesPath)) {
+        return nodeModulesPath;
+      }
+      return null;
+    }
+  } catch (err) {
+    return null;
+  }
+}
+
+/**
+ * Check if a directory has the expected theme structure
+ * 
+ * @param {string} dir - Directory to check
+ * @returns {boolean}
+ */
+function isValidThemeDirectory(dir) {
+  if (!existsSync(dir)) {
+    return false;
+  }
+
+  // A valid theme must have at least layouts and pages directories
+  const hasLayouts = existsSync(join(dir, 'layouts'));
+  const hasPages = existsSync(join(dir, 'pages'));
+  
+  return hasLayouts && hasPages;
+}
+
+/**
+ * Get the built-in themes directory path
+ * 
+ * @returns {string}
+ */
+export function getBuiltInThemesDir() {
+  return builtInThemesDir;
+}
+
+/**
+ * Get list of available built-in themes
+ * 
+ * @returns {string[]}
+ */
+export function getBuiltInThemes() {
+  return readdirSync(builtInThemesDir)
+    .filter(name => {
+      if (name.startsWith('_')) return false; // Skip _shared
+      const themePath = join(builtInThemesDir, name);
+      return statSync(themePath).isDirectory();
+    });
+}
+
+export default {
+  resolveTheme,
+  getBuiltInThemesDir,
+  getBuiltInThemes
+};
+