@terrymooreii/sia 2.0.0 → 2.0.1

package/_config.yml

@@ -30,4 +30,3 @@ pagination:
 
 server:
   port: 3000
-

package/defaults/includes/footer.njk

@@ -6,8 +6,8 @@
     </p>
     
     <nav class="footer-nav">
-      <a href="/feed.xml" class="footer-link">RSS</a>
-      <a href="/tags/" class="footer-link">Tags</a>
+      <a href="{{ '/feed.xml' | url }}" class="footer-link">RSS</a>
+      <a href="{{ '/tags/' | url }}" class="footer-link">Tags</a>
     </nav>
   </div>
 </footer>

package/defaults/includes/header.njk

@@ -1,12 +1,12 @@
 <header class="site-header">
   <div class="container">
-    <a href="/" class="site-logo">{{ site.title }}</a>
+    <a href="{{ '/' | url }}" class="site-logo">{{ site.title }}</a>
     
     <nav class="site-nav">
-      <a href="/" class="nav-link{% if page.url == '/' %} active{% endif %}">Home</a>
-      <a href="/blog/" class="nav-link{% if page.url and page.url.startsWith('/blog') %} active{% endif %}">Blog</a>
-      <a href="/notes/" class="nav-link{% if page.url and page.url.startsWith('/notes') %} active{% endif %}">Notes</a>
-      <a href="/tags/" class="nav-link{% if page.url and page.url.startsWith('/tags') %} active{% endif %}">Tags</a>
+      <a href="{{ '/' | url }}" class="nav-link{% if page.url == ('/' | url) %} active{% endif %}">Home</a>
+      <a href="{{ '/blog/' | url }}" class="nav-link{% if page.url and page.url.startsWith('/blog') %} active{% endif %}">Blog</a>
+      <a href="{{ '/notes/' | url }}" class="nav-link{% if page.url and page.url.startsWith('/notes') %} active{% endif %}">Notes</a>
+      <a href="{{ '/tags/' | url }}" class="nav-link{% if page.url and page.url.startsWith('/tags') %} active{% endif %}">Tags</a>
       {% if collections.pages %}
       {% for p in collections.pages | limit(3) %}
       <a href="{{ p.url }}" class="nav-link{% if page.url == p.url %} active{% endif %}">{{ p.title }}</a>

package/defaults/includes/tag-list.njk

@@ -1,7 +1,7 @@
 {% if allTags and allTags.length %}
 <div class="tag-cloud">
   {% for tag in allTags %}
-  <a href="/tags/{{ tag.slug }}/" class="tag tag-{{ 'lg' if tag.count > 10 else ('md' if tag.count > 5 else 'sm') }}">
+  <a href="{{ '/tags/' | url }}{{ tag.slug }}/" class="tag tag-{{ 'lg' if tag.count > 10 else ('md' if tag.count > 5 else 'sm') }}">
     {{ tag.name }}
     <span class="tag-count">({{ tag.count }})</span>
   </a>

package/defaults/layouts/base.njk

@@ -15,16 +15,16 @@
     })();
   </script>
   
-  <link rel="stylesheet" href="/styles/main.css">
+  <link rel="stylesheet" href="{{ '/styles/main.css' | url }}">
   
   <!-- Open Graph -->
   <meta property="og:title" content="{{ title or site.title }}">
   <meta property="og:description" content="{{ page.excerpt 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 '/' }}">
+  <meta property="og:url" content="{{ site.url }}{{ page.url or ('/' | url) }}">
   
   <!-- RSS Feed -->
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="/feed.xml">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | url }}">
   
   {% block head %}{% endblock %}
 </head>

package/defaults/layouts/note.njk

@@ -11,7 +11,7 @@
     {% if page.tags and page.tags.length %}
     <span class="note-tags">
       {% for tag in page.tags %}
-      <a href="/tags/{{ tag | slug }}/" class="tag">{{ tag }}</a>
+      <a href="{{ '/tags/' | url }}{{ tag | slug }}/" class="tag">{{ tag }}</a>
       {% endfor %}
     </span>
     {% endif %}
@@ -19,7 +19,7 @@
 </article>
 
 <nav class="note-nav">
-  <a href="/notes/" class="btn btn-secondary">← All Notes</a>
+  <a href="{{ '/notes/' | url }}" class="btn btn-secondary">← All Notes</a>
 </nav>
 {% endblock %}
 

package/defaults/layouts/post.njk

@@ -11,7 +11,7 @@
       <span class="post-meta-divider">·</span>
       <span class="post-tags">
         {% for tag in page.tags %}
-        <a href="/tags/{{ tag | slug }}/" class="tag">{{ tag }}</a>{% if not loop.last %}, {% endif %}
+        <a href="{{ '/tags/' | url }}{{ tag | slug }}/" class="tag">{{ tag }}</a>{% if not loop.last %}, {% endif %}
         {% endfor %}
       </span>
       {% endif %}
@@ -29,13 +29,13 @@
     <div class="post-tags-footer">
       <span class="tags-label">Tagged:</span>
       {% for tag in page.tags %}
-      <a href="/tags/{{ tag | slug }}/" class="tag">{{ tag }}</a>
+      <a href="{{ '/tags/' | url }}{{ tag | slug }}/" class="tag">{{ tag }}</a>
       {% endfor %}
     </div>
     {% endif %}
     
     <nav class="post-nav">
-      <a href="/blog/" class="btn btn-secondary">← Back to Blog</a>
+      <a href="{{ '/blog/' | url }}" class="btn btn-secondary">← Back to Blog</a>
     </nav>
   </footer>
 </article>

package/defaults/pages/blog.njk

@@ -19,7 +19,7 @@
     {% if post.tags and post.tags.length %}
     <div class="post-card-tags">
       {% for tag in post.tags %}
-      <a href="/tags/{{ tag | slug }}/" class="tag tag-sm">{{ tag }}</a>
+      <a href="{{ '/tags/' | url }}{{ tag | slug }}/" class="tag tag-sm">{{ tag }}</a>
       {% endfor %}
     </div>
     {% endif %}

package/defaults/pages/index.njk

@@ -9,7 +9,7 @@
 <section class="section">
   <div class="section-header">
     <h2 class="section-title">Latest Posts</h2>
-    <a href="/blog/" class="section-link">View all →</a>
+    <a href="{{ '/blog/' | url }}" class="section-link">View all →</a>
   </div>
   
   <div class="post-list">
@@ -23,7 +23,7 @@
         {% if post.tags and post.tags.length %}
         <span class="post-card-tags">
           {% for tag in post.tags | limit(3) %}
-          <a href="/tags/{{ tag | slug }}/" class="tag tag-sm">{{ tag }}</a>
+          <a href="{{ '/tags/' | url }}{{ tag | slug }}/" class="tag tag-sm">{{ tag }}</a>
           {% endfor %}
         </span>
         {% endif %}
@@ -40,7 +40,7 @@
 <section class="section">
   <div class="section-header">
     <h2 class="section-title">Recent Notes</h2>
-    <a href="/notes/" class="section-link">View all →</a>
+    <a href="{{ '/notes/' | url }}" class="section-link">View all →</a>
   </div>
   
   <div class="notes-grid">

package/defaults/pages/notes.njk

@@ -17,7 +17,7 @@
       {% if note.tags and note.tags.length %}
       <div class="note-item-tags">
         {% for tag in note.tags %}
-        <a href="/tags/{{ tag | slug }}/" class="tag tag-sm">{{ tag }}</a>
+        <a href="{{ '/tags/' | url }}{{ tag | slug }}/" class="tag tag-sm">{{ tag }}</a>
         {% endfor %}
       </div>
       {% endif %}

package/defaults/pages/tag.njk

@@ -21,7 +21,7 @@
     {% if post.tags and post.tags.length %}
     <div class="post-card-tags">
       {% for t in post.tags %}
-      <a href="/tags/{{ t | slug }}/" class="tag tag-sm{% if t | slug == tag.slug %} active{% endif %}">{{ t }}</a>
+      <a href="{{ '/tags/' | url }}{{ t | slug }}/" class="tag tag-sm{% if t | slug == tag.slug %} active{% endif %}">{{ t }}</a>
       {% endfor %}
     </div>
     {% endif %}
@@ -35,7 +35,7 @@
 {% include "pagination.njk" %}
 
 <nav class="page-nav">
-  <a href="/tags/" class="btn btn-secondary">← All Tags</a>
+  <a href="{{ '/tags/' | url }}" class="btn btn-secondary">← All Tags</a>
 </nav>
 {% endblock %}
 

package/defaults/pages/tags.njk

@@ -14,7 +14,7 @@
     {% for tag in allTags %}
     <section class="tag-section" id="{{ tag.slug }}">
       <h2 class="tag-section-title">
-        <a href="/tags/{{ tag.slug }}/">{{ tag.name }}</a>
+        <a href="{{ '/tags/' | url }}{{ tag.slug }}/">{{ tag.name }}</a>
         <span class="tag-section-count">({{ tag.count }})</span>
       </h2>
       <ul class="tag-posts">
@@ -25,7 +25,7 @@
         </li>
         {% endfor %}
         {% if tag.count > 5 %}
-        <li><a href="/tags/{{ tag.slug }}/" class="more-link">View all {{ tag.count }} →</a></li>
+        <li><a href="{{ '/tags/' | url }}{{ tag.slug }}/" class="more-link">View all {{ tag.count }} →</a></li>
         {% endif %}
       </ul>
     </section>

package/lib/build.js

@@ -42,13 +42,14 @@ function renderContentItem(env, item, siteData) {
  */
 function renderPaginatedPages(env, siteData, baseUrl, outputBase, templateName, extraData = {}) {
   const { paginatedCollections } = siteData;
+  const basePath = siteData.config.site.basePath || '';
   
   // Get all posts for the main blog listing
   const posts = siteData.collections.posts || [];
   const pages = paginate(posts, siteData.config.pagination.size);
   
   for (const page of pages) {
-    const pagination = getPaginationUrls(baseUrl, page);
+    const pagination = getPaginationUrls(baseUrl, page, basePath);
     
     const html = renderTemplate(env, templateName, {
       ...siteData,
@@ -72,6 +73,7 @@ function renderPaginatedPages(env, siteData, baseUrl, outputBase, templateName,
  */
 function renderTagPages(env, siteData) {
   const { tags, allTags, config } = siteData;
+  const basePath = config.site.basePath || '';
   
   // Render main tags listing page
   const tagsHtml = renderTemplate(env, 'tags.njk', {
@@ -86,7 +88,7 @@ function renderTagPages(env, siteData) {
     const baseUrl = `/tags/${tagSlug}/`;
     
     for (const page of tagPages) {
-      const pagination = getPaginationUrls(baseUrl, page);
+      const pagination = getPaginationUrls(baseUrl, page, basePath);
       
       const html = renderTemplate(env, 'tag.njk', {
         ...siteData,
@@ -144,6 +146,7 @@ function renderBlogListing(env, siteData) {
 function renderNotesListing(env, siteData) {
   const { config, collections } = siteData;
   const notes = collections.notes || [];
+  const basePath = config.site.basePath || '';
   
   if (notes.length === 0) return;
   
@@ -151,7 +154,7 @@ function renderNotesListing(env, siteData) {
   const pages = paginate(notes, config.pagination.size);
   
   for (const page of pages) {
-    const pagination = getPaginationUrls('/notes/', page);
+    const pagination = getPaginationUrls('/notes/', page, basePath);
     
     const html = renderTemplate(env, 'notes.njk', {
       ...siteData,

package/lib/collections.js

@@ -79,18 +79,22 @@ export function paginate(items, pageSize = 10) {
 
 /**
  * Generate pagination URLs
+ * @param {string} baseUrl - The base URL path (without basePath)
+ * @param {object} pagination - Pagination object
+ * @param {string} basePath - Optional basePath for subpath hosting
  */
-export function getPaginationUrls(baseUrl, pagination) {
+export function getPaginationUrls(baseUrl, pagination, basePath = '') {
+  const prefixedBaseUrl = basePath + baseUrl;
   return {
     ...pagination,
     url: pagination.pageNumber === 1 
-      ? baseUrl 
-      : `${baseUrl}page/${pagination.pageNumber}/`,
+      ? prefixedBaseUrl 
+      : `${prefixedBaseUrl}page/${pagination.pageNumber}/`,
     previousUrl: pagination.previousPage 
-      ? (pagination.previousPage === 1 ? baseUrl : `${baseUrl}page/${pagination.previousPage}/`)
+      ? (pagination.previousPage === 1 ? prefixedBaseUrl : `${prefixedBaseUrl}page/${pagination.previousPage}/`)
       : null,
     nextUrl: pagination.nextPage 
-      ? `${baseUrl}page/${pagination.nextPage}/`
+      ? `${prefixedBaseUrl}page/${pagination.nextPage}/`
       : null
   };
 }

package/lib/config.js

@@ -93,6 +93,14 @@ export function loadConfig(rootDir = process.cwd()) {
   // Merge user config with defaults
   const config = deepMerge(defaultConfig, userConfig);
   
+  // Extract basePath from site URL (e.g., "https://example.org/test" -> "/test")
+  try {
+    const siteUrl = new URL(config.site.url);
+    config.site.basePath = siteUrl.pathname.replace(/\/$/, '') || '';
+  } catch (e) {
+    config.site.basePath = '';
+  }
+  
   // Add computed paths
   config.rootDir = rootDir;
   config.inputDir = join(rootDir, config.input);

package/lib/content.js

@@ -262,7 +262,9 @@ export function loadCollection(config, collectionName) {
           .replace(':month', String(item.date.getMonth() + 1).padStart(2, '0'))
           .replace(':day', String(item.date.getDate()).padStart(2, '0'));
         
-        item.url = permalink;
+        // Prepend basePath for subpath hosting support
+        const basePath = config.site.basePath || '';
+        item.url = basePath + permalink;
         item.outputPath = join(config.outputDir, permalink, 'index.html');
         
         return item;

package/lib/templates.js

@@ -170,6 +170,22 @@ function jsonFilter(obj, spaces = 2) {
   return JSON.stringify(obj, null, spaces);
 }
 
+/**
+ * Create a URL filter that prepends the basePath
+ */
+function createUrlFilter(basePath) {
+  return function urlFilter(path) {
+    if (!path) return basePath || '/';
+    // If path is already absolute with protocol, return as-is
+    if (path.startsWith('http://') || path.startsWith('https://')) {
+      return path;
+    }
+    // Ensure path starts with /
+    const normalizedPath = path.startsWith('/') ? path : '/' + path;
+    return (basePath || '') + normalizedPath;
+  };
+}
+
 /**
  * Create and configure the Nunjucks environment
  */
@@ -214,6 +230,9 @@ export function createTemplateEngine(config) {
   env.addFilter('withTag', withTagFilter);
   env.addFilter('json', jsonFilter);
   
+  // Add URL filter with basePath support
+  env.addFilter('url', createUrlFilter(config.site.basePath));
+  
   return env;
 }
 

package/package.json

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