coralite-scripts 0.0.2 → 0.0.3

package/bin/{coralite-scripts.js → index.js}

@@ -5,19 +5,26 @@ import colours from 'kleur'
 import localAccess from 'local-access'
 import chokidar from 'chokidar'
 import loadConfig from '../src/load-config.js'
-import html from '../src/build-html.js'
 import buildSass from '../src/build-sass.js'
 import { toCode, toMS, toTime } from '../src/build-utils.js'
 import { extname, join } from 'path'
 import { readFile, access, constants } from 'fs/promises'
+import Coralite from 'coralite'
 
 const config = await loadConfig()
 const app = express()
 const port = config.server?.port || 3000
+
 // track active connections.
 const clients = new Set()
 
-const buildHTML = await html(config)
+// start coralite
+const coralite = new Coralite({
+  templates: config.templates,
+  pages: config.pages,
+  plugins: config.plugins
+})
+await coralite.initialise()
 
 const watchPath = [
   config.public,
@@ -97,37 +104,43 @@ app
 
       res.send(data)
     } catch {
-      try {
-        // if that fails, try reading from pages directory.
+      if (!path.endsWith('.html')) {
+        res.sendStatus(404)
+      } else {
         const filePath = join(config.pages, path)
 
-        // check if page source file exists and is readable
-        await access(filePath, constants.R_OK)
+        try {
+
+          // if that fails, try reading from pages directory.
+
+          // check if page source file exists and is readable
+          await access(filePath, constants.R_OK)
+        } catch {
+          res.sendStatus(404)
+        }
+
         const start = process.hrtime()
         let duration, dash = colours.gray(' ─ ')
 
+        await coralite.pages.setItem(filePath)
         // build the HTML for this page using the built-in compiler.
-        await buildHTML.compile(filePath)
-        const data = await readFile(filePath, 'utf8')
+        const documents = await coralite.compile(path)
         // inject a script to enable live reload via Server-Sent Events
-        const injectedHtml = data.replace(/<\/body>/i, `
-<script>
-  const eventSource = new EventSource('/_/rebuild');
-  eventSource.onmessage = function(event) {
-    if (event.data === 'connected') return;
-    // Reload page when file changes
-    location.reload()
-  }
-</script>
+        const injectedHtml = documents[0].html.replace(/<\/body>/i, `\n
+  <script>
+    const eventSource = new EventSource('/_/rebuild');
+    eventSource.onmessage = function(event) {
+      if (event.data === 'connected') return;
+      // Reload page when file changes
+      location.reload()
+    }
+  </script>
 </body>`)
 
         // prints time and path to the file that has been changed or added.
         duration = process.hrtime(start)
         process.stdout.write(toTime() + colours.bgGreen('Compiled HTML') + dash + toMS(duration) + dash + path + '\n')
         res.send(injectedHtml)
-      } catch(error) {
-        // if all attempts fail, respond with a 404.
-        res.sendStatus(404)
       }
     }
   })
@@ -139,9 +152,13 @@ const watcher = chokidar.watch(watchPath, {
 
 watcher
   .on('change', async (path) => {
-    if (path.endsWith('.scss') || path.endsWith('.sass')) {
-      const start = process.hrtime()
-      let duration, dash = colours.gray(' ─ ')
+    const start = process.hrtime()
+    let duration, dash = colours.gray(' ─ ')
+
+    if (path.startsWith(config.templates)) {
+      // update template file
+      await coralite.templates.setItem(path)
+    } else if (path.endsWith('.scss') || path.endsWith('.sass')) {
       // rebuild CSS and send notification
       await buildSass({
         ...config.sass,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "coralite-scripts",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Configuration and scripts for Create Coralite.",
   "type": "module",
   "bin": {
-    "coralite-scripts": "./bin/coralite-scripts.js"
+    "coralite-scripts": "./bin/index.js"
   },
   "keywords": [
     "coralite",

package/src/build-html.js

@@ -1,60 +0,0 @@
-import Coralite from 'coralite'
-
-/**
- * @import { CoralitePluginInstance } from 'coralite/types'
- */
-
-/**
- * Builds HTML files from Coralite templates and pages.
- *
- * @param {Object} options
- * @param {string} options.pages - Path to pages directory
- * @param {string} options.templates - Path to templates directory
- * @param {string} options.output - Output path for HTML files
- * @param {string} options.output - Output path for HTML files
- * @param {CoralitePluginInstance[]} [options.plugins=[]] - List of Coralite plugins.
- */
-export default async function html ({
-  pages,
-  templates,
-  output,
-  plugins
-}) {
-  const coralite = new Coralite({
-    templates,
-    pages,
-    plugins
-  })
-  await coralite.initialise()
-
-  return {
-    /**
-     * Compiles the specified HTML pages using coralite and saves the output to the configured output path.
-     * @param {string | string[]} [paths] - Path to a single page or array of page paths relative to the pages directory. If omitted, compiles all pages.
-     */
-    async compile (paths) {
-      let relativePathPages
-
-      if (Array.isArray(paths)) {
-        relativePathPages = []
-
-        for (let i = 0; i < paths.length; i++) {
-          const path = paths[i]
-
-          relativePathPages.push(path.replace(pages + '/', ''))
-        }
-      } else if (paths) {
-        relativePathPages = paths.replace(pages + '/', '')
-      }
-
-      if (relativePathPages && relativePathPages[0] === '/') {
-        relativePathPages = relativePathPages.slice(1)
-      }
-
-      const document = await coralite.compile(relativePathPages)
-
-      await coralite.save(document, output)
-    }
-  }
-}
-