@kenjura/ursa 0.9.0 → 0.32.0

package/src/serve.js

@@ -1,29 +1,135 @@
 import express from "express";
 import watch from "node-watch";
-
 import { generate } from "./jobs/generate.js";
 import { join, resolve } from "path";
+import fs from "fs";
+import { promises } from "fs";
+const { readdir } = promises;
+
+/**
+ * Configurable serve function for CLI and library use
+ */
+export async function serve({
+  _source,
+  _meta,
+  _output,
+  port = 8080,
+  _whitelist = null,
+  _clean = false
+} = {}) {
+  const sourceDir = resolve(_source);
+  const metaDir = resolve(_meta);
+  const outputDir = resolve(_output);
 
-const source = resolve(process.env.SOURCE ?? join(process.cwd(), "source"));
-const meta = resolve(process.env.META ?? join(process.cwd(), "meta"));
-const output = resolve(process.env.OUTPUT ?? join(process.cwd(), "build"));
+  console.log({ source: sourceDir, meta: metaDir, output: outputDir, port, whitelist: _whitelist, clean: _clean });
 
-console.log({ source, meta, output });
+  // Initial generation (use _clean flag only for initial generation)
+  console.log("Generating initial site...");
+  await generate({ _source: sourceDir, _meta: metaDir, _output: outputDir, _whitelist, _clean });
+  console.log("Initial generation complete. Starting server...");
 
-await generate({ source, meta, output });
-console.log("done generating. now serving...");
+  // Start file server
+  serveFiles(outputDir, port);
 
-serve(output);
+  // Watch for changes
+  console.log("Watching for file changes...");
+  
+  // Meta changes trigger full rebuild (templates, CSS, etc. affect all pages)
+  watch(metaDir, { recursive: true, filter: /\.(js|json|css|html|md|txt|yml|yaml)$/ }, async (evt, name) => {
+    console.log(`Meta files changed! Event: ${evt}, File: ${name}`);
+    console.log("Full rebuild required (meta files affect all pages)...");
+    try {
+      await generate({ _source: sourceDir, _meta: metaDir, _output: outputDir, _whitelist, _clean: true });
+      console.log("Regeneration complete.");
+    } catch (error) {
+      console.error("Error during regeneration:", error.message);
+    }
+  });
 
-watch(meta, { recursive: true }, async (evt, name) => {
-  console.log("meta files changed! generating output");
-  await generate({ source, meta, output });
-});
+  // Source changes use incremental mode (only regenerate changed files)
+  // Exception: CSS changes require full rebuild since they're embedded in all pages
+  watch(sourceDir, { recursive: true, filter: /\.(js|json|css|html|md|txt|yml|yaml)$/ }, async (evt, name) => {
+    console.log(`Source files changed! Event: ${evt}, File: ${name}`);
+    
+    // CSS files affect all pages (embedded styles), so trigger full rebuild
+    const isCssChange = name && name.endsWith('.css');
+    if (isCssChange) {
+      console.log("CSS change detected - full rebuild required...");
+      try {
+        await generate({ _source: sourceDir, _meta: metaDir, _output: outputDir, _whitelist, _clean: true });
+        console.log("Regeneration complete.");
+      } catch (error) {
+        console.error("Error during regeneration:", error.message);
+      }
+    } else {
+      console.log("Incremental rebuild...");
+      try {
+        await generate({ _source: sourceDir, _meta: metaDir, _output: outputDir, _whitelist });
+        console.log("Regeneration complete.");
+      } catch (error) {
+        console.error("Error during regeneration:", error.message);
+      }
+    }
+  });
 
-watch(source, { recursive: true }, async (evt, name) => {
-  console.log("source files changed! generating output");
-  await generate({ source, meta, output });
-});
+  console.log(`🚀 Development server running at http://localhost:${port}`);
+  console.log("📁 Serving files from:", outputDir);
+  console.log("👀 Watching for changes in:");
+  console.log("   Source:", sourceDir, "(incremental)");
+  console.log("   Meta:", metaDir, "(full rebuild)");
+  console.log("\nPress Ctrl+C to stop the server");
+}
+
+/**
+ * Start HTTP server to serve static files
+ */
+function serveFiles(outputDir, port = 8080) {
+  const app = express();
+
+  app.use(
+    express.static(outputDir, { extensions: ["html"], index: "index.html" })
+  );
+
+  app.get("/", async (req, res) => {
+    try {
+      console.log({ output: outputDir });
+      const dir = await readdir(outputDir);
+      const html = `
+        <!DOCTYPE html>
+        <html>
+        <head>
+          <title>Ursa Development Server</title>
+          <style>
+            body { font-family: Arial, sans-serif; margin: 40px; }
+            h1 { color: #333; }
+            ul { list-style-type: none; padding: 0; }
+            li { margin: 8px 0; }
+            a { color: #0066cc; text-decoration: none; }
+            a:hover { text-decoration: underline; }
+          </style>
+        </head>
+        <body>
+          <h1>Ursa Development Server</h1>
+          <p>Files in ${outputDir}:</p>
+          <ul>
+            ${dir
+              .map((file) => `<li><a href="${file}">${file}</a></li>`)
+              .join("")}
+          </ul>
+        </body>
+        </html>
+      `;
+      res.setHeader("Content-Type", "text/html");
+      res.send(html);
+    } catch (error) {
+      res.status(500).send("Error reading directory");
+    }
+  });
+
+  app.listen(port, () => {
+    console.log(`🌐 Server listening on port ${port}`);
+  });
+}
 
 /**
  * we're only interested in meta (and maybe, in the future, source)
@@ -39,31 +145,26 @@ function filter(filename, skip) {
   return false;
 }
 
-import fs, { stat } from "fs";
-import { promises } from "fs";
-const { readdir } = promises;
-import http from "http";
-import { Server } from "node-static";
+// Default serve function for backward compatibility (only run when executed directly)
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const source = resolve(process.env.SOURCE ?? join(process.cwd(), "source"));
+  const meta = resolve(process.env.META ?? join(process.cwd(), "meta"));
+  const output = resolve(process.env.OUTPUT ?? join(process.cwd(), "build"));
 
-function serve(root) {
-  const app = express();
-  const port = process.env.PORT || 8080;
+  console.log({ source, meta, output });
 
-  app.use(
-    express.static(output, { extensions: ["html"], index: "index.html" })
-  );
+  await generate({ _source: source, _meta: meta, _output: output });
+  console.log("done generating. now serving...");
 
-  app.get("/", async (req, res) => {
-    console.log({ output });
-    const dir = await readdir(output);
-    const html = dir
-      .map((file) => `<li><a href="${file}">${file}</a></li>`)
-      .join("");
-    res.setHeader("Content-Type", "text/html");
-    res.send(html);
+  serveFiles(output);
+
+  watch(meta, { recursive: true }, async (evt, name) => {
+    console.log("meta files changed! generating output");
+    await generate({ _source: source, _meta: meta, _output: output });
   });
 
-  app.listen(port, () => {
-    console.log(`server listening on port ${port}`);
+  watch(source, { recursive: true }, async (evt, name) => {
+    console.log("source files changed! generating output");
+    await generate({ _source: source, _meta: meta, _output: output });
   });
 }

package/.nvmrc

@@ -1 +0,0 @@
-16.18

package/.vscode/launch.json

@@ -1,20 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch Program",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "env": {
-                "INCLUDE_FILTER": "Kaine",
-            },
-            "program": "${workspaceFolder}/src/serve.js"
-        }
-    ]
-}

package/TODO.md

@@ -1,16 +0,0 @@
-# Basic Functionality
-
-- [x] Enable static assets from meta in build (perhaps by copying them?)
-- [x] Enable static assets from source in build
-- [ ] Handle menus at different levels
-- [x] Add a live-serve command that translates from source in real time (for testing)
-- [ ] Deal with crashes when no menu file is found
-
-
-# Wikitext
-- [ ] Support original site styles
-- [ ] Support original menu
-- [ ] Fix links
-
-# Mobile UI
-- [ ] Konsta UI

package/nodemon.json

@@ -1,16 +0,0 @@
-{
-  "restartable": "rs",
-  "ignore": [".git", "node_modules/**/node_modules", "build"],
-  "verbose": true,
-  "execMap": {
-    "js": "node --harmony"
-  },
-  "events": {
-    "restart": "osascript -e 'display notification \"App restarted due to:\n'$FILENAME'\" with title \"nodemon\"'"
-  },
-  "watch": ["src/", "docs/"],
-  "env": {
-    "NODE_ENV": "development"
-  },
-  "ext": "js,json,css,cjs,mjs,ts,tsx,html"
-}