@terrymooreii/sia 2.1.4 → 2.1.6

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/templates.js

@@ -12,7 +12,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 '';
   
@@ -205,7 +206,7 @@ export function createTemplateEngine(config) {
   }
   
   // Default templates from the selected theme
-  const themeName = config.theme || 'main';
+  const themeName = config.theme?.name || 'main';
   const themeDir = join(__dirname, '..', 'themes', themeName);
   templatePaths.push(join(themeDir, 'layouts'));
   templatePaths.push(join(themeDir, 'includes'));

package/package.json

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

package/readme.md

@@ -105,7 +105,8 @@ site:
   url: "https://example.com"
   author: "Your Name"
 
-theme: main  # 'main' or 'minimal'
+theme:
+  name: main  # Options: main, minimal, developer, magazine
 
 input: src
 output: dist

package/themes/_shared/includes/meta.njk

@@ -6,13 +6,14 @@
 <title>{% if title %}{{ title }} | {% endif %}{{ site.title }}</title>
 
 {# Open Graph #}
+{% set siteOrigin = site.url | replace(site.basePath, '') if site.basePath else site.url %}
 <meta property="og:title" content="{{ title or site.title }}">
 <meta property="og:description" content="{{ page.excerpt or page.description or site.description }}">
 <meta property="og:type" content="{% if page.collection == 'posts' %}article{% else %}website{% endif %}">
-<meta property="og:url" content="{{ site.url }}{{ page.url or ('/' | url) }}">
+<meta property="og:url" content="{{ siteOrigin }}{{ page.url if page.url else ('/' | url) }}">
 <meta property="og:site_name" content="{{ site.title }}">
 {% if page.image %}
-<meta property="og:image" content="{{ site.url }}{{ page.image | url }}">
+<meta property="og:image" content="{{ siteOrigin }}{{ page.image | url }}">
 {% endif %}
 
 {# Twitter Card #}
@@ -20,7 +21,7 @@
 <meta name="twitter:title" content="{{ title or site.title }}">
 <meta name="twitter:description" content="{{ page.excerpt or page.description or site.description }}">
 {% if page.image %}
-<meta name="twitter:image" content="{{ site.url }}{{ page.image | url }}">
+<meta name="twitter:image" content="{{ siteOrigin }}{{ page.image | url }}">
 {% endif %}
 
 {# Article specific meta (for blog posts) #}
@@ -38,4 +39,4 @@
 <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | url }}">
 
 {# Canonical URL #}
-<link rel="canonical" href="{{ site.url }}{{ page.url or ('/' | url) }}">
+<link rel="canonical" href="{{ siteOrigin }}{{ page.url if page.url else ('/' | url) }}">

package/themes/developer/includes/hero.njk

@@ -0,0 +1,6 @@
+{% if config.theme.showHero %}
+<section class="hero-section">
+  <h1 class="hero-title">{{ site.title }}</h1>
+  <p class="hero-description">{{ site.description }}</p>
+</section>
+{% endif %}

package/themes/developer/pages/blog.njk

@@ -20,7 +20,7 @@
         {% endif %}
         
         <h2 class="card-title">
-          <a href="{{ post.url | url }}">{{ post.title }}</a>
+          <a href="{{ post.url }}">{{ post.title }}</a>
         </h2>
         
         <p class="card-excerpt">{{ post.excerpt | excerpt(150) }}</p>

package/themes/developer/pages/index.njk

@@ -2,10 +2,7 @@
 
 {% block content %}
 <div class="home-page">
-  <section class="hero-section">
-    <h1 class="hero-title">{{ site.title }}</h1>
-    <p class="hero-description">{{ site.description }}</p>
-  </section>
+  {% include "hero.njk" %}
   
   <section class="posts-section">
     <div class="section-header">
@@ -26,7 +23,7 @@
           {% endif %}
           
           <h3 class="card-title">
-            <a href="{{ post.url | url }}">{{ post.title }}</a>
+            <a href="{{ post.url }}">{{ post.title }}</a>
           </h3>
           
           <p class="card-excerpt">{{ post.excerpt | excerpt(120) }}</p>
@@ -55,7 +52,7 @@
       <article class="note-card">
         <time class="note-time">{{ note.date | date('short') }}</time>
         <div class="note-preview">{{ note.excerpt | excerpt(150) }}</div>
-        <a href="{{ note.url | url }}" class="note-link">Read more →</a>
+        <a href="{{ note.url }}" class="note-link">Read more →</a>
       </article>
       {% endfor %}
     </div>

package/themes/developer/pages/notes.njk

@@ -17,7 +17,7 @@
         </time>
         <div class="timeline-body">
           <div class="note-text">{{ note.excerpt | excerpt(200) }}</div>
-          <a href="{{ note.url | url }}" class="read-more">Continue reading →</a>
+          <a href="{{ note.url }}" class="read-more">Continue reading →</a>
         </div>
         {% if note.tags %}
         <div class="timeline-tags">

package/themes/developer/pages/tag.njk

@@ -20,7 +20,7 @@
         {% endif %}
         
         <h2 class="card-title">
-          <a href="{{ post.url | url }}">{{ post.title }}</a>
+          <a href="{{ post.url }}">{{ post.title }}</a>
         </h2>
         
         <p class="card-excerpt">{{ post.excerpt | excerpt(150) }}</p>

package/themes/magazine/includes/hero.njk

@@ -0,0 +1,8 @@
+{% if config.theme.showHero %}
+<section class="hero">
+  <div class="hero-content">
+    <h1 class="hero-title">{{ site.title }}</h1>
+    <p class="hero-subtitle">{{ site.description }}</p>
+  </div>
+</section>
+{% endif %}

package/themes/magazine/layouts/post.njk

@@ -68,7 +68,7 @@
       {% if post.url != page.url %}
       <article class="read-more-card">
         <h3 class="read-more-card-title">
-          <a href="{{ post.url | url }}">{{ post.title }}</a>
+          <a href="{{ post.url }}">{{ post.title }}</a>
         </h3>
         <time class="read-more-date">{{ post.date | date('short') }}</time>
       </article>

package/themes/magazine/pages/blog.njk

@@ -14,7 +14,7 @@
       <a href="{{ ('/tags/' + (post.tags[0] | slug) + '/') | url }}" class="row-category">{{ post.tags[0] }}</a>
       {% endif %}
       <h2 class="row-title">
-        <a href="{{ post.url | url }}">{{ post.title }}</a>
+        <a href="{{ post.url }}">{{ post.title }}</a>
       </h2>
       <p class="row-excerpt">{{ post.excerpt | excerpt(180) }}</p>
       <div class="row-meta">

package/themes/magazine/pages/index.njk

@@ -1,12 +1,7 @@
 {% extends "base.njk" %}
 
 {% block content %}
-<section class="hero">
-  <div class="hero-content">
-    <h1 class="hero-title">{{ site.title }}</h1>
-    <p class="hero-subtitle">{{ site.description }}</p>
-  </div>
-</section>
+{% include "hero.njk" %}
 
 {% set featuredPost = collections.posts[0] %}
 {% if featuredPost %}

package/themes/magazine/pages/notes.njk

@@ -14,7 +14,7 @@
     </time>
     <div class="note-content">
       <p>{{ note.excerpt | excerpt(250) }}</p>
-      <a href="{{ note.url | url }}" class="note-read-more">Continue reading →</a>
+      <a href="{{ note.url }}" class="note-read-more">Continue reading →</a>
     </div>
     {% if note.tags %}
     <div class="note-item-tags">

package/themes/magazine/pages/tag.njk

@@ -12,7 +12,7 @@
   <article class="article-row">
     <div class="article-row-content">
       <h2 class="row-title">
-        <a href="{{ post.url | url }}">{{ post.title }}</a>
+        <a href="{{ post.url }}">{{ post.title }}</a>
       </h2>
       <p class="row-excerpt">{{ post.excerpt | excerpt(180) }}</p>
       <div class="row-meta">

package/themes/main/includes/hero.njk

@@ -0,0 +1,6 @@
+{% if config.theme.showHero %}
+<section class="hero">
+  <h1 class="hero-title">{{ site.title }}</h1>
+  <p class="hero-description">{{ site.description }}</p>
+</section>
+{% endif %}

package/themes/main/pages/index.njk

@@ -1,10 +1,7 @@
 {% extends "base.njk" %}
 
 {% block content %}
-<section class="hero">
-  <h1 class="hero-title">{{ site.title }}</h1>
-  <p class="hero-description">{{ site.description }}</p>
-</section>
+{% include "hero.njk" %}
 
 <section class="section">
   <div class="section-header">

package/themes/minimal/includes/hero.njk

@@ -0,0 +1,6 @@
+{% if config.theme.showHero %}
+<section class="hero">
+  <h1 class="hero-title">{{ site.title }}</h1>
+  <p class="hero-description">{{ site.description }}</p>
+</section>
+{% endif %}

package/themes/minimal/pages/index.njk

@@ -1,10 +1,7 @@
 {% extends "base.njk" %}
 
 {% block content %}
-<section class="hero">
-  <h1 class="hero-title">{{ site.title }}</h1>
-  <p class="hero-description">{{ site.description }}</p>
-</section>
+{% include "hero.njk" %}
 
 <section class="section">
   <div class="section-header">
@@ -47,7 +44,7 @@
   <div class="notes-grid">
     {% for note in collections.notes | limit(3) %}
     <article class="note-card">
-      <div class="note-card-content">{{ note.excerpt }}</div>
+      <div class="note-card-content">{{ note.excerptHtml | safe }}</div>
       <footer class="note-card-footer">
         <time datetime="{{ note.date | date('iso') }}">{{ note.date | date('full_time') }}</time>
         <a href="{{ note.url }}" class="note-card-link">View →</a>