clovie 0.1.2 → 0.1.4

package/README.md

@@ -135,7 +135,7 @@ export default {
 Clovie supports asynchronous data loading for dynamic content:
 
 ```javascript
-// app.config.js
+// clovie.config.js
 export default {
   // ... other config
   data: async () => {
@@ -157,7 +157,7 @@ export default {
 Create multiple pages from data arrays using the models system:
 
 ```javascript
-// app.config.js
+// clovie.config.js
 export default {
   // ... other config
   data: {
@@ -369,7 +369,7 @@ When you create a new project with `clovie create`, you get this structure:
 
 ```
 my-site/
-├── app.config.js          # Configuration
+├── clovie.config.js          # Configuration
 ├── package.json           # Dependencies and scripts
 ├── README.md              # Project documentation
 ├── views/                 # HTML templates
@@ -386,7 +386,7 @@ You can also create your own structure:
 
 ```
 my-site/
-├── app.config.js          # Configuration
+├── clovie.config.js          # Configuration
 ├── views/                 # Templates
 │   ├── _base.html        # Base template (partial)
 │   ├── _header.html      # Header partial

package/bin/cli.js

@@ -77,7 +77,7 @@ const argv = mainOptions._unknown || [];
 
 // Command-specific options
 const optionDefinitions = [
-  { name: 'config', alias: 'c', type: String, defaultValue: 'app.config.js' },
+  { name: 'config', alias: 'c', type: String, defaultValue: 'clovie.config.js' },
   { name: 'watch', alias: 'w', type: Boolean },
   { name: 'template', alias: 't', type: String, defaultValue: 'default' }
 ];
@@ -97,9 +97,21 @@ const configPath = path.resolve(process.cwd(), options.config);
 // Main function
 async function main() {
   try {
-    // Config file
-    const configModule = await import(configPath);
-    const config = configModule.default || configModule;
+    // Config file - use default if not found
+    let config;
+    try {
+      const configModule = await import(configPath);
+      config = configModule.default || configModule;
+    } catch (err) {
+      if (err.code === 'ERR_MODULE_NOT_FOUND') {
+        // Use default config if clovie.config.js not found
+        const defaultConfigModule = await import('../config/clovie.config.js');
+        config = defaultConfigModule.default;
+        console.log('📁 Using default Clovie configuration');
+      } else {
+        throw err;
+      }
+    }
 
     // New Clovie instance
     const site = new Clovie(config);

package/config/{default.config.js → clovie.config.js}

@@ -5,15 +5,19 @@ export default {
   // Smart defaults - these paths are automatically detected
   scripts: null,        // Will auto-detect if not specified
   styles: null,         // Will auto-detect if not specified
-  views: null,          // Will auto-detect if not specified
   assets: null,         // Will auto-detect if not specified
+  views: null,
+  partials: null,
   outputDir: path.resolve('./dist/'),
   
   // Data and models
   data: {},
   models: {},
   
-  // Default compiler - Handlebars for powerful templating
+  register: (name, template) => {
+    Handlebars.registerPartial(name, template);
+  },
+
   compiler: (template, data) => {
     try {
       const compiled = Handlebars.compile(template);

package/lib/core/discover.js

@@ -53,6 +53,18 @@ export function discoverProjectStructure(config) {
     }
   }
   
+  // Auto-detect partials directory
+  if (!discovered.partials) {
+    const partialDirs = ['partials', 'components', 'src/partials', 'src/components'];
+    for (const dir of partialDirs) {
+      if (fs.existsSync(path.join(cwd, dir))) {
+        discovered.partials = path.join('./', dir);
+        console.log(`🔍 Auto-detected partials directory: ${dir}`);
+        break;
+      }
+    }
+  }
+  
   // Auto-detect assets directory
   if (!discovered.assets) {
     const assetDirs = ['assets', 'public', 'static', 'src/assets', 'src/public'];

package/lib/core/getPartials.js

@@ -0,0 +1,59 @@
+import fs from 'fs';
+import path from 'path';
+import { readFilesToMap } from '../utils/readFilesToMap.js';
+
+export default function (partialsPath) {
+  try {
+    if (!partialsPath || !fs.existsSync(partialsPath)) {
+      console.warn(`Partials directory does not exist: ${partialsPath}`);
+      return {};
+    }
+    
+    // Get all files from the partials directory
+    const fileNames = getFileNames(partialsPath);
+    const templates = fileNames ? readFilesToMap(fileNames, partialsPath) : {};
+    
+    // Convert templates to partials object with filename as key (without extension)
+    const partials = {};
+    for (const [filePath, template] of Object.entries(templates)) {
+      const fileName = path.parse(filePath).name; // Get filename without extension
+      partials[fileName] = template;
+    }
+    
+    return partials;
+  } catch (err) {
+    console.error(`Error processing partials from ${partialsPath}:`, err);
+    return {};
+  }
+}
+
+function getFileNames (PATH, files = fs.readdirSync(PATH, { withFileTypes: true }), accumulator = [], depth = 0) {
+  // Prevent infinite recursion and stack overflow
+  const MAX_DEPTH = 50;
+  if (depth > MAX_DEPTH) {
+    console.warn(`Maximum directory depth exceeded at: ${PATH}`);
+    return accumulator;
+  }
+
+  if (!files || files.length === 0) return accumulator;
+  
+  let value = files.shift();
+  if (!value) return accumulator;
+
+  try {
+    if (value && !value.name.startsWith('.')) {
+      let name = path.join(PATH, value.name);
+      let res = value.isDirectory() ? getFileNames(name, [], [], depth + 1) : name;
+    
+      if (Array.isArray(res)) {
+        accumulator = accumulator.concat(res)
+      } else {
+        accumulator.push(res)
+      }
+    }
+  } catch (err) {
+    console.error(`Error processing file/directory: ${PATH}/${value?.name}:`, err);
+  }
+
+  return files.length ? getFileNames(PATH, files, accumulator, depth) : accumulator;
+}

package/lib/core/getViews.js

@@ -1,27 +1,35 @@
 import fs from 'fs';
 import path from 'path';
 import { readFilesToMap } from '../utils/readFilesToMap.js';
+import getPartials from './getPartials.js';
 
-export default function (src, models = {}, data) {
+export default function (src, models = {}, data, partialsPath = null) {
   try {
     if (!src || !fs.existsSync(src)) {
       console.warn(`Views directory does not exist: ${src}`);
-      return {};
+      return { pages: {}, partials: {} };
     }
     
     let fileNames = getFileNames(src);
     let templates = fileNames ? readFilesToMap(fileNames, src) : null;
     let pages = templates ? getPages(templates, data) : {};
+    let partials = {};
+    
+    // Process partials if path is provided
+    if (partialsPath) {
+      partials = getPartials(partialsPath);
+    }
     
     // Process models if any exist
     if (Object.keys(models).length > 0) {
-      return processModels(templates, data, models, pages);
+      const processedPages = processModels(templates, data, models, pages);
+      return { pages: processedPages, partials };
     }
     
-    return pages;
+    return { pages, partials };
   } catch (err) {
     console.error(`Error processing views from ${src}:`, err);
-    return {};
+    return { pages: {}, partials: {} };
   }
 }
 

package/lib/core/render.js

@@ -1,8 +1,19 @@
 import type from 'type-detect';
 
-const render = async (views, compiler, fileNames = Object.keys(views), isDevMode = false, accumulator = {}) => {
+const render = async (views, compiler, fileNames = Object.keys(views), isDevMode = false, partials = {}, register = null, accumulator = {}) => {
   if (!fileNames || fileNames.length === 0) return accumulator;
   
+  // Process partials if register function is provided
+  if (register && Object.keys(partials).length > 0) {
+    try {
+      for (const [name, template] of Object.entries(partials)) {
+        register(name, template);
+      }
+    } catch (err) {
+      console.warn('⚠️  Could not register partials:', err.message);
+    }
+  }
+  
   // Live reload script to inject in development mode
   const liveReloadScript = `
   <!-- Live Reload Script (Development Mode Only) -->

package/lib/core/watcher.js

@@ -6,7 +6,7 @@ import { BuildCache } from './cache.js';
 export class SmartWatcher {
   constructor(clovieInstance) {
     this.clovie = clovieInstance;
-    this.watcher = null;
+    this.watchers = [];
     this.cache = new BuildCache(clovieInstance.config.outputDir);
     this.debounceTimer = null;
     this.isWatching = false;
@@ -20,14 +20,28 @@ export class SmartWatcher {
     
     // Watch views directory
     if (this.clovie.config.views) {
-      this.watcher = chokidar.watch(this.clovie.config.views, {
+      const viewsWatcher = chokidar.watch(this.clovie.config.views, {
         ignored: /(^|[\/\\])\../, // Ignore hidden files
         persistent: true
       });
       
-      this.watcher.on('change', (filePath) => this.handleViewChange(filePath));
-      this.watcher.on('add', (filePath) => this.handleViewChange(filePath));
-      this.watcher.on('unlink', (filePath) => this.handleViewChange(filePath));
+      viewsWatcher.on('change', (filePath) => this.handleViewChange(filePath));
+      viewsWatcher.on('add', (filePath) => this.handleViewChange(filePath));
+      viewsWatcher.on('unlink', (filePath) => this.handleViewChange(filePath));
+      this.watchers.push(viewsWatcher);
+    }
+
+    // Watch partials directory
+    if (this.clovie.config.partials) {
+      const partialsWatcher = chokidar.watch(this.clovie.config.partials, {
+        ignored: /(^|[\/\\])\../, // Ignore hidden files
+        persistent: true
+      });
+      
+      partialsWatcher.on('change', (filePath) => this.handlePartialChange(filePath));
+      partialsWatcher.on('add', (filePath) => this.handlePartialChange(filePath));
+      partialsWatcher.on('unlink', (filePath) => this.handlePartialChange(filePath));
+      this.watchers.push(partialsWatcher);
     }
     
     // Watch scripts directory
@@ -40,6 +54,7 @@ export class SmartWatcher {
       scriptsWatcher.on('change', (filePath) => this.handleScriptChange(filePath));
       scriptsWatcher.on('add', (filePath) => this.handleScriptChange(filePath));
       scriptsWatcher.on('unlink', (filePath) => this.handleScriptChange(filePath));
+      this.watchers.push(scriptsWatcher);
     }
     
     // Watch styles directory
@@ -52,6 +67,7 @@ export class SmartWatcher {
       stylesWatcher.on('change', (filePath) => this.handleStyleChange(filePath));
       stylesWatcher.on('add', (filePath) => this.handleStyleChange(filePath));
       stylesWatcher.on('unlink', (filePath) => this.handleStyleChange(filePath));
+      this.watchers.push(stylesWatcher);
     }
     
     // Watch assets directory
@@ -64,16 +80,17 @@ export class SmartWatcher {
       assetsWatcher.on('change', (filePath) => this.handleAssetChange(filePath));
       assetsWatcher.on('add', (filePath) => this.handleAssetChange(filePath));
       assetsWatcher.on('unlink', (filePath) => this.handleAssetChange(filePath));
+      this.watchers.push(assetsWatcher);
     }
     
     console.log('✅ Smart watcher started');
   }
   
   stop() {
-    if (this.watcher) {
-      this.watcher.close();
-      this.watcher = null;
-    }
+    this.watchers.forEach(watcher => {
+      watcher.close();
+    });
+    this.watchers = [];
     this.isWatching = false;
     console.log('🛑 Smart watcher stopped');
   }
@@ -94,6 +111,7 @@ export class SmartWatcher {
     try {
       // Only rebuild what's necessary based on what changed
       switch (type) {
+        case 'partial':
         case 'view':
           await this.rebuildViews();
           break;
@@ -129,7 +147,9 @@ export class SmartWatcher {
     try {
       // Re-process all views
       const getViews = await import('./getViews.js');
-      this.clovie.views = getViews.default(this.clovie.config.views, this.clovie.config.models, this.clovie.data);
+      const viewsResult = getViews.default(this.clovie.config.views, this.clovie.config.models, this.clovie.data, this.clovie.config.partials);
+      this.clovie.views = viewsResult.pages;
+      this.clovie.partials = viewsResult.partials;
       
       // Convert to the format expected by render (same as main build process)
       this.clovie.processedViews = {};
@@ -143,7 +163,14 @@ export class SmartWatcher {
       
       // Re-render all views using the render function
       const render = await import('./render.js');
-      this.clovie.rendered = await render.default(this.clovie.processedViews, this.clovie.config.compiler, Object.keys(this.clovie.processedViews), this.clovie.isDevMode);
+      this.clovie.rendered = await render.default(
+        this.clovie.processedViews, 
+        this.clovie.config.compiler, 
+        Object.keys(this.clovie.processedViews), 
+        this.clovie.isDevMode,
+        this.clovie.partials,
+        this.clovie.config.register
+      );
       
       // Write the updated views
       const write = await import('./write.js');
@@ -237,6 +264,10 @@ export class SmartWatcher {
   handleViewChange(filePath) {
     this.scheduleRebuild('view', filePath);
   }
+
+  handlePartialChange(filePath) {
+    this.scheduleRebuild('partial', filePath);
+  }
   
   handleScriptChange(filePath) {
     this.scheduleRebuild('script', filePath);

package/lib/main.js

@@ -14,7 +14,7 @@ import getViews from './core/getViews.js';
 import render from './core/render.js';
 import write from './core/write.js';
 import clean from './utils/clean.js';
-import defaultConfig from '../config/default.config.js';
+import defaultConfig from '../config/clovie.config.js';
 import { discoverProjectStructure } from './core/discover.js';
 import { SmartWatcher } from './core/watcher.js';
 import { DevServer } from './core/server.js';
@@ -108,7 +108,9 @@ export default class Clovie {
       
       // Process views
       console.log('📝 Processing views...');
-      this.views = getViews(this.config.views, this.config.models, this.data);
+      const viewsResult = getViews(this.config.views, this.config.models, this.data, this.config.partials);
+      this.views = viewsResult.pages;
+      this.partials = viewsResult.partials;
       
       // Convert to the format expected by render
       this.processedViews = {};
@@ -120,10 +122,18 @@ export default class Clovie {
         }
       }
       console.log(`   Processed ${Object.keys(this.processedViews).length} views`);
+      console.log(`   Loaded ${Object.keys(this.partials).length} partials`);
       
       // Render templates
       console.log('🎨 Rendering templates...');
-      this.rendered = await render(this.processedViews, this.config.compiler, Object.keys(this.processedViews), this.isDevMode);
+      this.rendered = await render(
+        this.processedViews, 
+        this.config.compiler, 
+        Object.keys(this.processedViews), 
+        this.isDevMode,
+        this.partials,
+        this.config.register
+      );
       console.log(`   Rendered ${Object.keys(this.rendered).length} templates`);
       
       // Process assets in parallel for speed
@@ -213,9 +223,9 @@ export default class Clovie {
         process.nextTick(async () => {
           try {
             console.log('Recompile Templates');
-            this.views = getViews(this.config.views, this.config.models, this.data);
+            this.views = getViews(this.config.views.path, this.config.models, this.data);
             this.urls = Object.keys(this.views);
-            this.rendered = await render(this.views, this.config.compiler, this.urls);
+            this.rendered = await render(this.views, this.config.views.compiler, this.urls);
             this.cache = write(this.rendered, this.config.outputDir, Object.keys(this.rendered), this.cache);
             console.log('Templates Done');
           } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clovie",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Vintage web dev tooling with modern quality of life",
   "keywords": [
     "static-site-generator",

package/templates/default/package.json

@@ -7,6 +7,6 @@
     "dev": "clovie watch"
   },
   "devDependencies": {
-    "clovie": "^0.1.0"
+    "clovie": "^0.1.3"
   }
 }