webspresso 0.0.11 → 0.0.12

package/README.md

@@ -715,6 +715,17 @@ The `fsy` object is available in all templates:
 {{ fsy.prettyBytes(1024) }}
 {{ fsy.prettyMs(5000) }}
 
+{# Date/Time helpers (dayjs) #}
+{{ fsy.dateFormat(post.created_at, 'YYYY-MM-DD HH:mm') }}
+{{ fsy.dateFromNow(post.created_at) }} {# "2 hours ago" #}
+{{ fsy.dateAgo(post.created_at) }} {# "2 hours ago" #}
+{{ fsy.dateUntil(event.date) }} {# "in 2 hours" #}
+{{ fsy.date(post.created_at).format('MMMM D, YYYY') }} {# Full dayjs API #}
+{% if fsy.dateIsBefore(post.created_at, fsy.date()) %}Published{% endif %}
+{{ fsy.dateDiff(post.created_at, fsy.date(), 'day') }} days ago
+{{ fsy.dateAdd(post.created_at, 7, 'day').format('YYYY-MM-DD') }}
+{{ fsy.dateStartOf(post.created_at, 'month').format('YYYY-MM-DD') }}
+
 {# Environment #}
 {% if fsy.isDev() %}Dev mode{% endif %}
 

package/bin/webspresso.js

@@ -9,7 +9,7 @@ const { program } = require('commander');
 const inquirer = require('inquirer');
 const fs = require('fs');
 const path = require('path');
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 
 program
   .name('webspresso')
@@ -1493,8 +1493,66 @@ program
       faker = require('@faker-js/faker');
     } catch {
       console.error('❌ @faker-js/faker not installed.');
-      console.log('   Install it with: npm install @faker-js/faker');
-      process.exit(1);
+      
+      // Check if it's in package.json
+      const packageJsonPath = path.join(process.cwd(), 'package.json');
+      let shouldInstall = false;
+      
+      if (fs.existsSync(packageJsonPath)) {
+        try {
+          const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+          const hasFaker = packageJson.dependencies?.['@faker-js/faker'] || 
+                          packageJson.devDependencies?.['@faker-js/faker'];
+          
+          if (hasFaker) {
+            console.log('   @faker-js/faker is in package.json but not installed.');
+            console.log('   Run: npm install');
+            process.exit(1);
+          } else {
+            // Ask if user wants to install it
+            const { install } = await inquirer.prompt([
+              {
+                type: 'confirm',
+                name: 'install',
+                message: 'Install @faker-js/faker now?',
+                default: true
+              }
+            ]);
+            
+            if (install) {
+              shouldInstall = true;
+            } else {
+              console.log('   Install it manually with: npm install @faker-js/faker');
+              process.exit(1);
+            }
+          }
+        } catch (err) {
+          console.log('   Install it with: npm install @faker-js/faker');
+          process.exit(1);
+        }
+      } else {
+        console.log('   Install it with: npm install @faker-js/faker');
+        process.exit(1);
+      }
+      
+      // Install faker if user confirmed
+      if (shouldInstall) {
+        console.log('\n📦 Installing @faker-js/faker...\n');
+        try {
+          execSync('npm install @faker-js/faker', {
+            stdio: 'inherit',
+            cwd: process.cwd()
+          });
+          console.log('\n✅ @faker-js/faker installed successfully!\n');
+          
+          // Try to require again
+          faker = require('@faker-js/faker');
+        } catch (err) {
+          console.error('\n❌ Failed to install @faker-js/faker:', err.message);
+          console.log('   Install it manually with: npm install @faker-js/faker');
+          process.exit(1);
+        }
+      }
     }
 
     // Load database config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Minimal, production-ready SSR framework for Node.js with file-based routing, Nunjucks templating, built-in i18n, and CLI tooling",
   "main": "index.js",
   "bin": {
@@ -38,6 +38,7 @@
   ],
   "dependencies": {
     "commander": "^11.1.0",
+    "dayjs": "^1.11.19",
     "express": "^4.18.2",
     "helmet": "^7.2.0",
     "inquirer": "^8.2.6",
@@ -46,11 +47,11 @@
     "zod": "^3.23.0"
   },
   "peerDependencies": {
+    "@faker-js/faker": "^9.0.0",
+    "better-sqlite3": "^9.0.0",
     "dotenv": "^16.0.0",
-    "pg": "^8.0.0",
     "mysql2": "^3.0.0",
-    "better-sqlite3": "^9.0.0",
-    "@faker-js/faker": "^9.0.0"
+    "pg": "^8.0.0"
   },
   "peerDependenciesMeta": {
     "dotenv": {

package/src/helpers.js

@@ -6,6 +6,17 @@
 const querystring = require('querystring');
 const fs = require('fs');
 const path = require('path');
+const dayjs = require('dayjs');
+const relativeTime = require('dayjs/plugin/relativeTime');
+const utc = require('dayjs/plugin/utc');
+const timezone = require('dayjs/plugin/timezone');
+const customParseFormat = require('dayjs/plugin/customParseFormat');
+
+// Extend dayjs with plugins
+dayjs.extend(relativeTime);
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(customParseFormat);
 
 /**
  * Asset Manager - handles asset paths, versioning, and manifest
@@ -419,6 +430,157 @@ function createHelpers(ctx) {
      */
     img(src, alt = '', attrs = {}) {
       return getAssetManager().img(src, alt, attrs);
+    },
+
+    /**
+     * Date/time helpers using dayjs
+     */
+    
+    /**
+     * Create a dayjs instance from a date
+     * @param {string|Date|number} date - Date to parse
+     * @param {string} format - Optional format string
+     * @returns {Object} dayjs instance
+     */
+    date(date, format) {
+      if (!date) return dayjs();
+      if (format) {
+        return dayjs(date, format);
+      }
+      return dayjs(date);
+    },
+
+    /**
+     * Format a date
+     * @param {string|Date|number} date - Date to format
+     * @param {string} format - Format string (default: 'YYYY-MM-DD')
+     * @returns {string}
+     */
+    dateFormat(date, format = 'YYYY-MM-DD') {
+      if (!date) return '';
+      return dayjs(date).format(format);
+    },
+
+    /**
+     * Get relative time (e.g., "2 hours ago")
+     * @param {string|Date|number} date - Date to format
+     * @returns {string}
+     */
+    dateFromNow(date) {
+      if (!date) return '';
+      return dayjs(date).fromNow();
+    },
+
+    /**
+     * Get time ago (e.g., "2 hours ago")
+     * @param {string|Date|number} date - Date to format
+     * @returns {string}
+     */
+    dateAgo(date) {
+      if (!date) return '';
+      return dayjs(date).fromNow();
+    },
+
+    /**
+     * Get time until (e.g., "in 2 hours")
+     * @param {string|Date|number} date - Date to format
+     * @returns {string}
+     */
+    dateUntil(date) {
+      if (!date) return '';
+      return dayjs(date).toNow();
+    },
+
+    /**
+     * Check if date is before another date
+     * @param {string|Date|number} date1 - First date
+     * @param {string|Date|number} date2 - Second date
+     * @returns {boolean}
+     */
+    dateIsBefore(date1, date2) {
+      if (!date1 || !date2) return false;
+      return dayjs(date1).isBefore(date2);
+    },
+
+    /**
+     * Check if date is after another date
+     * @param {string|Date|number} date1 - First date
+     * @param {string|Date|number} date2 - Second date
+     * @returns {boolean}
+     */
+    dateIsAfter(date1, date2) {
+      if (!date1 || !date2) return false;
+      return dayjs(date1).isAfter(date2);
+    },
+
+    /**
+     * Check if date is same as another date
+     * @param {string|Date|number} date1 - First date
+     * @param {string|Date|number} date2 - Second date
+     * @param {string} unit - Unit to compare (day, month, year, etc.)
+     * @returns {boolean}
+     */
+    dateIsSame(date1, date2, unit = 'day') {
+      if (!date1 || !date2) return false;
+      return dayjs(date1).isSame(date2, unit);
+    },
+
+    /**
+     * Get difference between two dates
+     * @param {string|Date|number} date1 - First date
+     * @param {string|Date|number} date2 - Second date
+     * @param {string} unit - Unit (day, month, year, hour, minute, second)
+     * @returns {number}
+     */
+    dateDiff(date1, date2, unit = 'day') {
+      if (!date1 || !date2) return 0;
+      return dayjs(date1).diff(date2, unit);
+    },
+
+    /**
+     * Add time to a date
+     * @param {string|Date|number} date - Date to add to
+     * @param {number} amount - Amount to add
+     * @param {string} unit - Unit (day, month, year, hour, minute, second)
+     * @returns {Object} dayjs instance
+     */
+    dateAdd(date, amount, unit = 'day') {
+      if (!date) return dayjs();
+      return dayjs(date).add(amount, unit);
+    },
+
+    /**
+     * Subtract time from a date
+     * @param {string|Date|number} date - Date to subtract from
+     * @param {number} amount - Amount to subtract
+     * @param {string} unit - Unit (day, month, year, hour, minute, second)
+     * @returns {Object} dayjs instance
+     */
+    dateSubtract(date, amount, unit = 'day') {
+      if (!date) return dayjs();
+      return dayjs(date).subtract(amount, unit);
+    },
+
+    /**
+     * Get start of a time period
+     * @param {string|Date|number} date - Date
+     * @param {string} unit - Unit (day, month, year, week)
+     * @returns {Object} dayjs instance
+     */
+    dateStartOf(date, unit = 'day') {
+      if (!date) return dayjs();
+      return dayjs(date).startOf(unit);
+    },
+
+    /**
+     * Get end of a time period
+     * @param {string|Date|number} date - Date
+     * @param {string} unit - Unit (day, month, year, week)
+     * @returns {Object} dayjs instance
+     */
+    dateEndOf(date, unit = 'day') {
+      if (!date) return dayjs();
+      return dayjs(date).endOf(unit);
     }
   };
 }