@daz4126/swifty 1.0.0 → 1.1.0

package/init.js

@@ -1,7 +1,13 @@
 #!/usr/bin/env node
 
-const fs = require("fs");
-const path = require("path");
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+
+// Needed to emulate __dirname in ES modules
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 // Define the structure
 const structure = {
@@ -28,14 +34,12 @@ const structure = {
   </main>
     <footer>
     <p>This site was built with Swifty, the super speedy static site generator.</p>
-    <p><a href="/tags.html" data-turbo-frame="content" data-turbo-action="advance">All Tags</a></p>
   </footer>
 </body>
 </html>
   `
 };
 
-// Function to create files and folders
 function createStructure(basePath, structure) {
   Object.entries(structure).forEach(([filePath, content]) => {
     const fullPath = path.join(basePath, filePath);
@@ -48,7 +52,6 @@ function createStructure(basePath, structure) {
   });
 }
 
-// Execute script
 const projectRoot = process.cwd();
 createStructure(projectRoot, structure);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/swifty",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "index.js",
   "type": "module",
   "bin": {
@@ -16,16 +16,18 @@
   "author": "DAZ",
   "license": "MIT",
   "description": "Super Speedy Static Site Generator",
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
+    "jest": "^29.7.0",
+    "mocha": "^11.1.0",
     "fs-extra": "^11.2.0",
     "gray-matter": "^4.0.3",
+    "highlight.js": "^11.11.1",
     "js-yaml": "^4.1.0",
     "marked": "^14.1.3",
-    "serve": "^14.2.4"
-  },
-  "devDependencies": {
-    "jest": "^29.7.0",
-    "mocha": "^11.1.0"
+    "marked-highlight": "^2.2.1",
+    "serve": "^14.2.4",
+    "sharp": "^0.33.5"
   },
   "directories": {
     "test": "test"

package/swifty.js

@@ -2,9 +2,25 @@ import fs from "fs/promises";
 import fsExtra from "fs-extra";
 import path from "path";
 import matter from "gray-matter";
-import { marked } from "marked";
 import yaml from "js-yaml";
+import sharp from "sharp";
 import { fileURLToPath } from "url";
+import { marked } from "marked";
+import { markedHighlight } from "marked-highlight";
+import hljs from 'highlight.js';
+
+marked.use(
+  markedHighlight({
+    langPrefix: 'hljs language-',
+    highlight: (code, lang) => {
+      if (lang && hljs.getLanguage(lang)) {
+        return hljs.highlight(code, { language: lang }).value;
+      } else {
+        return hljs.highlightAuto(code).value; // Auto-detect the language
+      }
+    },
+  })
+);
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -21,23 +37,12 @@ const dirs = {
   partials: path.join(baseDir, 'partials'),
 };
 
-const lastBuildFile = path.join(dirs.dist, '.last_build.json');
-
-const loadLastBuildData = async () => {
-  try {
-    const data = await fs.readFile(lastBuildFile, 'utf-8');
-    return JSON.parse(data);
-  } catch (err) {
-    return {}; // Return empty object if file doesn't exist
-  }
-};
-
 const tagsMap = new Map();
 const addToTagMap = (tag, page) => {
   if (!tagsMap.has(tag)) tagsMap.set(tag, []);
   tagsMap.get(tag).push({ title: page.title, url: page.url });
 };
-
+const pageIndex = [];
 const partialCache = new Map();
 
 const loadPartial = async (partialName) => {
@@ -90,6 +95,37 @@ const copyAssets = async () => {
   await ensureAndCopy(dirs.images, path.join(dirs.dist, 'images'), validExtensions.images);
 };
 
+async function optimizeImages() {
+  try {
+    const IMAGE_EXTENSIONS = ['.jpg', '.jpeg', '.png'];
+    const images_folder = path.join(dirs.dist, "images");
+    const files = await fs.readdir(images_folder);
+    
+    await Promise.all(files.map(async (file) => {
+      const filePath = path.join(images_folder, file);
+      const ext = path.extname(file).toLowerCase();
+      
+      if (!IMAGE_EXTENSIONS.includes(ext)) return;
+      
+      const optimizedPath = path.join(images_folder, `${path.basename(file, ext)}.webp`);
+      
+      // Ensure we are not overwriting the same file
+      if (filePath !== optimizedPath) {
+        await sharp(filePath)
+          .resize({ width: defaultConfig.max_image_size || 800 })
+          .toFormat('webp', { quality: 80 })
+          .toFile(optimizedPath);
+        
+        await fs.unlink(filePath);
+        
+        console.log(`Optimized ${file} -> ${optimizedPath}`);
+      }
+    }));
+  } catch (error) {
+    console.error('Error optimizing images:', error);
+  }
+};
+
 // Utility: Generate HTML imports for assets
 const generateAssetImports = async (dir, tagTemplate, validExts) => {
   if (!(await fsExtra.pathExists(dir))) return '';
@@ -188,7 +224,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       const name = root ? "Home" : capitalize(file.name.replace(/\.md$/, "").replace(/-/g, " "));
       const stats = await fs.stat(filePath);
       const isDirectory = file.isDirectory();
-      const assetPath = parent ? parent.filename : "default";
+      const assetPath = parent ? parent.filename : "pages";
       const layoutFileExists = await fsExtra.pathExists(dirs.layouts + "/" + assetPath + ".html");
       const layout = !root && layoutFileExists && assetPath;
 
@@ -210,24 +246,34 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       if (path.extname(file.name) === ".md") {
         const markdownContent = await fs.readFile(filePath, "utf-8");
         const { data, content } = matter(markdownContent);
-        Object.assign(page, { data: { ...page.data, ...data }, content });
+        const index = pages.findIndex(p => p.url === page.url);
+        if (index !== -1) {
+          Object.assign(pages[index], { data: { ...page.data, ...data }, content });
+          continue;
+        }
+        else Object.assign(page, { data: { ...page.data, ...data }, content });
       }
       if (isDirectory) {
         page.pages = await generatePages(filePath, baseDir, page);
-        console.log(page.pages[0].name)
         page.pages.sort((a, b) => {
           if (a.data.position && b.data.position) {
             return a.data.position - b.data.position; // Sort by position first
           }
           return new Date(a.updated_at) - new Date(b.updated_at); // If position is the same, sort by date
         });
-        if(!page.content) page.content = await generateLinkList(page.filename,page.pages);     
+        const index = pages.findIndex(p => p.url === page.url);
+        if (index !== -1) {
+          page.content = pages[index].content;
+          pages.splice(index, 1);
+        }
+        else page.content = await generateLinkList(page.filename,page.pages);     
       }
 
     // add tags
     if (page.data.tags) page.data.tags.forEach(tag => addToTagMap(tag, page));
-    
+
     pages.push(page);
+    pageIndex.push({url: page.url, title: page.title || page.title, nav: page.nav})
     }
 
   } catch (err) {
@@ -244,7 +290,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
         folder: true,
         name: "Tags",
         title: "All Tags",
-        layout: "default",
+        layout: "pages",
         updated_at: new Date().toLocaleDateString(undefined,defaultConfig.dateFormat),
         data: {...config},
     }
@@ -256,7 +302,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
             updated_at: new Date().toLocaleDateString(undefined,defaultConfig.dateFormat),
             path: `/tags/${tag}`,
             url:  `/tags/${tag}.html`,
-            layout: tagLayout ? "tags" : "default",
+            layout: tagLayout ? "tags" : "pages",
             data: {...config, title: `Pages tagged with ${capitalize(tag)}`},
           };
           page.content = pages
@@ -286,7 +332,8 @@ const generateLinkList = async (name,pages) => {
 
 const render = async page => {
   const replacedContent = await replacePlaceholders(page.content, page);
-  const htmlContent = marked.parse(replacedContent, { gfm: true, breaks: true }); // Markdown processed once
+  const htmlContent = marked.parse(replacedContent); // Markdown processed once
+
   const wrappedContent = await applyLayoutAndWrapContent(page, htmlContent);
   return wrappedContent;
 };
@@ -303,7 +350,8 @@ const renderIndexTemplate = async (content, config) => {
   const js = await getJsImports();
   const imports = css + js;
 
-  templateContent = templateContent.replace('</head>', `${turboMetaTag}\n${imports}\n</head>`);
+  const highlightCSS = `<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.7.0/styles/monokai-sublime.min.css">`;
+  templateContent = templateContent.replace('</head>', `${turboMetaTag}\n${imports}\n${highlightCSS}\n</head>`);
   templateContent = await replacePlaceholders(templateContent,{...defaultConfig,...config,content})
 
   // Add the missing script to the template
@@ -390,7 +438,8 @@ const replacePlaceholders = async (template, values) => {
     partialContent = await replacePlaceholders(partialContent, values); // Recursive replacement
     return marked(partialContent); // Convert Markdown to HTML
   });
-
+  // replace image extensions with optimized extension
+  template = template.replace(/\.(png|jpe?g|webp)/gi, ".webp");
   // Replace other placeholders **only outside of code blocks**
   const codeBlockRegex = /```[\s\S]*?```|`[^`]+`|<(pre|code)[^>]*>[\s\S]*?<\/\1>/g;
     const codeBlocks = [];
@@ -398,12 +447,10 @@ const replacePlaceholders = async (template, values) => {
         codeBlocks.push(match);
         return `{{CODE_BLOCK_${codeBlocks.length - 1}}}`; // Temporary placeholder
     });
-
     // Replace placeholders outside of code blocks
     template = template.replace(/{{\s*([^}\s]+)\s*}}/g, (match, key) => {
       return(values.data && key in values?.data ? values.data[key] : key in values ? values[key] : match)
     });
-
     // Restore code blocks
     template = template.replace(/{{CODE_BLOCK_(\d+)}}/g, (_, index) => codeBlocks[index]);
 
@@ -414,17 +461,16 @@ const addLinks = async (pages,parent) => {
   pages.forEach(async page => {
     page.data ||= {};
     page.data.links_to_tags = page?.data?.tags?.length
-    ? `<div class="tags">${page.data.tags.map(tag => `<a class="${defaultConfig.tag_class}" href="/tags/${tag}.html" data-turbo-frame="content" data-turbo-action="advance">${tag}</a>`).join``}</div>`
-    : "";
-    const crumb = page.root ? "" : ` &raquo; <a class="${defaultConfig.breadcrumb_class}" href="${page.url}" data-turbo-frame="content" data-turbo-action="advance">${page.name}</a>`;
+    ? page.data.tags.map(tag => `<a class="${defaultConfig.tag_class}" href="/tags/${tag}.html" data-turbo-frame="content" data-turbo-action="advance">${tag}</a>`).join`` : "";
+    const crumb = page.root ? "" : ` ${defaultConfig.breadcrumb_separator} <a class="${defaultConfig.breadcrumb_class}" href="${page.url}" data-turbo-frame="content" data-turbo-action="advance">${page.name}</a>`;
     page.data.breadcrumbs = parent ? parent.data.breadcrumbs + crumb
     : `<a class="${defaultConfig.breadcrumb_class}" href="/" data-turbo-frame="content" data-turbo-action="advance">Home</a>` + crumb;
-    page.data.links_to_children = await pages.pages ? generateLinkList(page.filename,page.pages) : "";
+    page.data.links_to_children = page.pages ? await generateLinkList(page.filename,page.pages) : "";
     page.data.links_to_siblings = await generateLinkList(page.parent?.filename || "pages",pages.filter(p => p.url !== page.url));
     page.data.links_to_self_and_siblings = await generateLinkList(page.parent?.filename || "pages",pages);
-    page.data.nav_links = await generateLinkList("nav",pages.filter(p => p.nav));
+    page.data.nav_links = await generateLinkList("nav",pageIndex.filter(p => p.nav));
     if(page.pages) {
-      addLinks(page.pages,page)
+      await addLinks(page.pages,page)
     }
   });
 }
@@ -434,6 +480,7 @@ const generateSite = async () => {
   console.log('Starting build process...');
   // Copy images, CSS, and JS files
   await copyAssets();
+  await optimizeImages();
   // Convert markdown in pages directory
   const pages = await generatePages(dirs.pages);
   await addLinks(pages);

package/config.yaml

@@ -1,11 +0,0 @@
-sitename: Swifty
-author: Taylor Swift
-breadcrumb_class: swifty_breadcrumb
-link_class: swifty_link
-tag_class: tag
-
-dateFormat: 
-  weekday: short
-  month: short
-  day: numeric
-  year: numeric

package/css/custom.css

@@ -1,30 +0,0 @@
-h1.logo {
-  color: var(--primary);
-  text-transform: none;
- }
-
-.post-info{
-  margin-top: -1rem;
-}
-
-.post{
-  margin: 1rem;
-  border-bottom: 1px dotted var(--grey);
-}
-
-header{
-  padding: 1rem 2rem;
-}
-
-header a.logo{
-  text-decoration: none;
-  font-family: var(--fancy-font);
-  border-radius:50%;
-  background: var(--primary);
-  color: var(--bg);
-  text-align: center;
-  vertical-align: middle;
-  height: 2em;
-  width: 2em;
-  line-height: 2;
-}