clovie 0.1.11 → 0.1.13

package/bin/cli.js

@@ -131,14 +131,13 @@ const options = commandLineArgs(optionDefinitions, { argv });
 
 
 
-// Handle watch command
+// Handle legacy command mappings
 if (mainOptions.command === 'watch') {
-  options.watch = true;
+  mainOptions.command = 'dev'; // Map watch to dev
 }
 
-// Handle server command
 if (mainOptions.command === 'server') {
-  options.server = true;
+  mainOptions.command = 'serve'; // Map server to serve
 }
 
 // Config path
@@ -147,136 +146,106 @@ const configPath = path.resolve(process.cwd(), options.config);
 // Main function
 async function main() {
   try {
-    // 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;
-      }
-    }
+    const command = mainOptions.command || 'dev'; // Default to dev
+    console.log(`🚀 Starting Clovie ${command}...`);
+    
+    // Step 1: Load config file (with fallback to default)
+    const config = await loadConfig(options.config);
+    
+    // Step 2: Determine mode based on command
+    const mode = determineMode(command, config);
+    
+    // Step 3: Create Clovie instance with explicit mode
+    console.log('⚙️  Creating Clovie instance...');
+    const clovie = await createClovie({
+      ...config,
+      configPath: configPath,
+      mode: mode
+    });
+    
+    // Step 4: Execute specific command
+    await executeCommand(clovie, command, options);
 
-    // Override config type if server command is used
-    if (options.server) {
-      config.type = 'server';
+  } catch (err) {
+    console.error('❌ Error:', err.message || err);
+    process.exit(1);
+  }
+}
+
+// Load configuration with fallback
+async function loadConfig(configPath) {
+  try {
+    const configModule = await import(configPath);
+    const config = configModule.default || configModule;
+    console.log(`📁 Using config: ${options.config}`);
+    return config;
+  } 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');
+      const config = defaultConfigModule.default;
+      console.log('📁 Using default Clovie configuration');
+      return config;
+    } else {
+      throw err;
     }
+  }
+}
 
-    // New Clovie instance
-    const clovie = await createClovie(config);
+// Determine mode based on command and config
+function determineMode(command, config) {
+  // If config explicitly sets mode, use it unless overridden by command
+  if (config.mode && !['build', 'serve', 'dev', 'watch'].includes(command)) {
+    return config.mode;
+  }
+  
+  // Command-based mode determination
+  switch (command) {
+    case 'build': 
+      return 'production';
+    case 'serve': 
+      return 'production';
+    case 'dev':
+    case 'watch': 
+      return 'development';
+    default: 
+      return 'development';
+  }
+}
 
-    if (options.server) {
-      // Server mode - run as Express server
-      console.log('🌐 Starting server mode...');
-      
-      // Load data into state first
-      if (config.data) {
-        console.log('📊 Loading data into state...');
-        let loadedData = {};
-        if (typeof config.data === 'function') {
-          loadedData = await config.data();
-        } else if (typeof config.data === 'object') {
-          loadedData = config.data;
-        }
-        clovie.state.load(loadedData);
-        console.log(`   Loaded ${Object.keys(loadedData).length} data sources into state`);
-      }
-      
-      // Start server
-      clovie.server.start();
-      
-      // Keep the process running
-      process.on('SIGINT', () => {
-        console.log('\n🛑 Stopping server...');
-        clovie.server.stop();
-        process.exit(0);
-      });
-      
-    } else if (options.watch) {
-      // Development mode with file watching
-      console.log('🏗️  Initial build...');
-      await clovie.build.static();
-      console.log('✅ Initial build completed\n');
-      
-      // Start development server
-      clovie.server.start();
-      
-      // Set up file watching
-      console.log('👀 Setting up file watching...');
-      
-      // Debug: Check if config service is available
-      console.log('   Debug: config service available:', !!clovie.config);
-      console.log('   Debug: getWatchPaths available:', !!clovie.config?.getWatchPaths);
-      
-      // Use discovered config paths from Config service
-      let watchPaths;
-      try {
-        watchPaths = clovie.config.getWatchPaths();
-      } catch (error) {
-        console.error('   Error getting watch paths:', error.message);
-        // Fallback to manual discovery for debugging
-        const discoveredConfig = clovie.config.get();
-        watchPaths = [
-          discoveredConfig?.views,
-          discoveredConfig?.partials,
-          discoveredConfig?.styles,
-          discoveredConfig?.scripts,
-          discoveredConfig?.assets
-        ].filter(Boolean);
-        console.log('   Using fallback watch paths:', watchPaths);
-      }
-      
-      console.log(`   Watching ${watchPaths.length} directories:`, watchPaths);
-      
-      // Set up file watchers with change handler
-      const watchers = clovie.file.watch(watchPaths, {}, {
-        onChange: async (filePath) => {
-          console.log('🔄 Triggering rebuild...');
-          
-          try {
-            const result = await clovie.build.static();
-            console.log(`✅ Rebuild completed in ${result.buildTime}ms`);
-            
-            // Notify live reload
-            if (clovie.server && clovie.server.notifyReload) {
-              clovie.server.notifyReload();
-            }
-          } catch (error) {
-            console.error('❌ Rebuild failed:', error.message);
-          }
-        }
-      });
+// Execute the specific command
+async function executeCommand(clovie, command, options) {
+  switch (command) {
+    case 'build':
+      console.log('🔨 Building project...');
+      await clovie.run.build();
+      console.log('✅ Build completed successfully');
+      process.exit(0);
       
-      console.log(`🌐 Development server running at http://localhost:${config.port || 3000}`);
-      console.log('👀 Watching for file changes...');
-      console.log('Press Ctrl+C to stop the server\n');
+    case 'serve':
+      console.log('🌐 Starting production server...');
+      await clovie.run.serve();
+      // Keep process alive for server
+      break;
       
-      // Keep the process running
-      process.on('SIGINT', () => {
-        console.log('\n🛑 Stopping development server...');
-        if (clovie.file.isWatching()) {
-          clovie.file.stopWatching();
-        }
-        process.exit(0);
-      });
+    case 'dev':
+    case 'watch':
+      console.log('🚀 Starting development server...');
+      await clovie.run.dev();
+      // Keep process alive for dev server
+      break;
       
-    } else {
-      // Build mode
-      const result = await clovie.build.static();
-      console.log(`✅ Build completed in ${result.buildTime}ms`);
-      console.log(`📁 Generated ${result.filesGenerated} files`);
-      process.exit(0);
-    }
-  } catch (err) {
-    console.error(err);
-    process.exit(1);
+    default:
+      console.error(`❌ Unknown command: ${command}`);
+      console.error('Available commands: build, serve, dev, watch');
+      process.exit(1);
   }
+  
+  // Setup graceful shutdown for long-running processes
+  process.on('SIGINT', () => {
+    console.log('\n🛑 Shutting down...');
+    process.exit(0);
+  });
 }
 
 // Run main function

package/dist/LiveReload-CGbacq3U.js

@@ -0,0 +1,95 @@
+import { Server } from "socket.io";
+
+import { S as ServiceProvider, q as queueMacrotask } from "./createClovie-1_zYoNTN.js";
+
+import "stream";
+
+import "module";
+
+import "path";
+
+import "crypto";
+
+import "fs";
+
+import "istextorbinary";
+
+import "chokidar";
+
+import "readline";
+
+import "events";
+
+import "node:process";
+
+import "node:os";
+
+import "node:tty";
+
+class LiveReload extends ServiceProvider {
+    static manifest={
+        name: "Clovie LiveReload",
+        namespace: "liveReload",
+        version: "1.0.0"
+    };
+    #io;
+    #reloading=!1;
+    getter() {
+        return {
+            io: () => this.#io
+        };
+    }
+    actions() {
+        return {
+            initializeServer: async server => {
+                const log = this.useContext("log");
+                "development" === this.config?.mode && await this.#setupSocketIO(server, log);
+            },
+            notifyReload: () => {
+                this.#reloading || (this.#reloading = !0, queueMacrotask(() => {
+                    this.#reloading = !1, this.#io.emit("reload");
+                }));
+            },
+            injectLiveReloadScript: async (renderedContent, config) => {
+                const lastBodyIndex = renderedContent.lastIndexOf("</body>");
+                if (-1 !== lastBodyIndex) {
+                    const scriptConfig = {
+                        mode: config.mode || "development",
+                        port: config.port || 3e3
+                    };
+                    try {
+                        renderedContent = renderedContent.substring(0, lastBodyIndex) + this.#liveReloadScript(scriptConfig) + "\n" + renderedContent.substring(lastBodyIndex);
+                    } catch (err) {
+                        console.warn("⚠️  Could not load live reload script:", err.message);
+                    }
+                }
+                return renderedContent;
+            }
+        };
+    }
+    async #setupSocketIO(server, log) {
+        try {
+            await new Promise(resolve => setTimeout(resolve, 100)), log.debug("Setting up Socket.IO..."), 
+            this.#io = new Server(server, {
+                cors: {
+                    origin: "*",
+                    methods: [ "GET", "POST" ]
+                },
+                transports: [ "polling", "websocket" ],
+                allowEIO3: !0
+            }), this.#io.on("connection", socket => {
+                log.debug(`Client connected: ${socket.id}`), socket.on("disconnect", reason => {
+                    log.debug(`Client disconnected: ${socket.id} - ${reason}`);
+                }), socket.on("error", error => {
+                    log.error("Socket error:", error);
+                });
+            }), log.info("Socket.IO server ready");
+        } catch (error) {
+            log.error("Error setting up Socket.IO:", error);
+        }
+    }
+    #liveReloadScript=config => `\x3c!-- Live Reload Script (Development Mode Only) --\x3e\n<script src="https://cdn.socket.io/4.7.4/socket.io.min.js"><\/script>\n<script>\n  (function() {\n    const config = ${JSON.stringify(config)};\n    \n    console.log('Initializing live reload with config:', config);\n    \n    // Configure Socket.IO client with proper options\n    const socket = io({\n      transports: ['polling', 'websocket'],\n      timeout: 20000,\n      forceNew: true\n    });\n    \n    socket.on('reload', () => {\n      console.log('Live reload triggered');\n      window.location.reload();\n    });\n    \n    socket.on('connect', () => {\n      console.log('Connected to live reload server');\n    });\n    \n    socket.on('disconnect', (reason) => {\n      console.log('Disconnected from live reload server:', reason);\n    });\n    \n    socket.on('connect_error', (error) => {\n      console.error('Connection error:', error);\n      console.log('Retrying connection in 3 seconds...');\n      setTimeout(() => {\n        socket.connect();\n      }, 3000);\n    });\n    \n    socket.on('error', (error) => {\n      console.error('Socket error:', error);\n    });\n    \n    // Add connection timeout\n    setTimeout(() => {\n      if (!socket.connected) {\n        console.warn('Live reload connection timeout - server may not be running');\n      }\n    }, 5000);\n  })();\n<\/script>`;
+}
+
+export { LiveReload };
+//# sourceMappingURL=LiveReload-CGbacq3U.js.map

package/dist/LiveReload-CGbacq3U.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LiveReload-CGbacq3U.js","sources":["../lib/LiveReload.js"],"sourcesContent":["import { Server as SocketIOServer } from 'socket.io';\nimport { ServiceProvider } from '@brickworks/engine';\nimport { queueMacrotask } from './utils/tasks.js';\n\nexport class LiveReload extends ServiceProvider {\n  static manifest = {\n    name: 'Clovie LiveReload',\n    namespace: 'liveReload',\n    version: '1.0.0',\n  };\n\n  #io;\n  #reloading = false;\n\n  getter () {\n    return {\n      io: () => this.#io,\n    }\n  }\n\n  actions() {\n    return {\n      initializeServer: async (server) => {\n        const log = this.useContext('log');\n        if (this.config?.mode === 'development') {\n          await this.#setupSocketIO(server, log);\n        }\n      },\n      notifyReload: () => {\n        if (this.#reloading) return;\n        this.#reloading = true;\n        \n        queueMacrotask(() => {\n          this.#reloading = false;\n          this.#io.emit('reload')\n        });\n      },\n      injectLiveReloadScript: async (renderedContent, config) => {\n        const lastBodyIndex = renderedContent.lastIndexOf('</body>');\n        if (lastBodyIndex !== -1) {\n          const scriptConfig = { \n            mode: config.mode || 'development', \n            port: config.port || 3000 \n          };\n          \n          try {\n            // Import live reload script dynamically            \n            renderedContent = renderedContent.substring(0, lastBodyIndex) + \n                            this.#liveReloadScript(scriptConfig) + '\\n' + \n                            renderedContent.substring(lastBodyIndex);\n          } catch (err) {\n            console.warn('⚠️  Could not load live reload script:', err.message);\n          }\n        }\n        return renderedContent;\n      }\n    }\n  }\n\n  async #setupSocketIO(server, log) {\n    try {\n      // Wait a bit for server to be fully initialized\n      await new Promise(resolve => setTimeout(resolve, 100));\n\n      log.debug('Setting up Socket.IO...');\n      \n      // Configure Socket.IO with proper CORS and options\n      this.#io = new SocketIOServer(server, {\n        cors: {\n          origin: \"*\",\n          methods: [\"GET\", \"POST\"]\n        },\n        transports: ['polling', 'websocket'],\n        allowEIO3: true\n      });\n\n      this.#io.on('connection', (socket) => {\n        log.debug(`Client connected: ${socket.id}`);\n        \n        socket.on('disconnect', (reason) => {\n          log.debug(`Client disconnected: ${socket.id} - ${reason}`);\n        });\n        \n        socket.on('error', (error) => {\n          log.error('Socket error:', error);\n        });\n      });\n\n      log.info('Socket.IO server ready');\n    } catch (error) {\n      log.error('Error setting up Socket.IO:', error);\n    }\n  }\n\n  #liveReloadScript = (config) => `<!-- Live Reload Script (Development Mode Only) -->\n<script src=\"https://cdn.socket.io/4.7.4/socket.io.min.js\"></script>\n<script>\n  (function() {\n    const config = ${JSON.stringify(config)};\n    \n    console.log('Initializing live reload with config:', config);\n    \n    // Configure Socket.IO client with proper options\n    const socket = io({\n      transports: ['polling', 'websocket'],\n      timeout: 20000,\n      forceNew: true\n    });\n    \n    socket.on('reload', () => {\n      console.log('Live reload triggered');\n      window.location.reload();\n    });\n    \n    socket.on('connect', () => {\n      console.log('Connected to live reload server');\n    });\n    \n    socket.on('disconnect', (reason) => {\n      console.log('Disconnected from live reload server:', reason);\n    });\n    \n    socket.on('connect_error', (error) => {\n      console.error('Connection error:', error);\n      console.log('Retrying connection in 3 seconds...');\n      setTimeout(() => {\n        socket.connect();\n      }, 3000);\n    });\n    \n    socket.on('error', (error) => {\n      console.error('Socket error:', error);\n    });\n    \n    // Add connection timeout\n    setTimeout(() => {\n      if (!socket.connected) {\n        console.warn('Live reload connection timeout - server may not be running');\n      }\n    }, 5000);\n  })();\n</script>`;\n}"],"names":["LiveReload","ServiceProvider","static","name","namespace","version","io","reloading","getter","this","actions","initializeServer","async","server","log","useContext","config","mode","setupSocketIO","notifyReload","queueMacrotask","emit","injectLiveReloadScript","renderedContent","lastBodyIndex","lastIndexOf","scriptConfig","port","substring","liveReloadScript","err","console","warn","message","Promise","resolve","setTimeout","debug","SocketIOServer","cors","origin","methods","transports","allowEIO3","on","socket","id","reason","error","info","JSON","stringify"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIO,MAAMA,mBAAmBC;IAC9BC,gBAAkB;QAChBC,MAAM;QACNC,WAAW;QACXC,SAAS;;IAGXC;IACAC,YAAa;IAEb,MAAAC;QACE,OAAO;YACLF,IAAI,MAAMG,MAAKH;;AAEnB;IAEA,OAAAI;QACE,OAAO;YACLC,kBAAkBC,MAAOC;gBACvB,MAAMC,MAAML,KAAKM,WAAW;gBACF,kBAAtBN,KAAKO,QAAQC,cACTR,MAAKS,cAAeL,QAAQC;;YAGtCK,cAAc;gBACRV,MAAKF,cACTE,MAAKF,aAAa,GAElBa,eAAe;oBACbX,MAAKF,aAAa,GAClBE,MAAKH,GAAIe,KAAK;;;YAGlBC,wBAAwBV,OAAOW,iBAAiBP;gBAC9C,MAAMQ,gBAAgBD,gBAAgBE,YAAY;gBAClD,KAAsB,MAAlBD,eAAsB;oBACxB,MAAME,eAAe;wBACnBT,MAAMD,OAAOC,QAAQ;wBACrBU,MAAMX,OAAOW,QAAQ;;oBAGvB;wBAEEJ,kBAAkBA,gBAAgBK,UAAU,GAAGJ,iBAC/Bf,MAAKoB,iBAAkBH,gBAAgB,OACvCH,gBAAgBK,UAAUJ;AAC5C,sBAAE,OAAOM;wBACPC,QAAQC,KAAK,0CAA0CF,IAAIG;AAC7D;AACF;gBACA,OAAOV;;;AAGb;IAEA,oBAAML,CAAeL,QAAQC;QAC3B;kBAEQ,IAAIoB,QAAQC,WAAWC,WAAWD,SAAS,OAEjDrB,IAAIuB,MAAM;YAGV5B,MAAKH,KAAM,IAAIgC,OAAezB,QAAQ;gBACpC0B,MAAM;oBACJC,QAAQ;oBACRC,SAAS,EAAC,OAAO;;gBAEnBC,YAAY,EAAC,WAAW;gBACxBC,YAAW;gBAGblC,MAAKH,GAAIsC,GAAG,cAAeC;gBACzB/B,IAAIuB,MAAM,qBAAqBQ,OAAOC,OAEtCD,OAAOD,GAAG,cAAeG;oBACvBjC,IAAIuB,MAAM,wBAAwBQ,OAAOC,QAAQC;oBAGnDF,OAAOD,GAAG,SAAUI;oBAClBlC,IAAIkC,MAAM,iBAAiBA;;gBAI/BlC,IAAImC,KAAK;AACX,UAAE,OAAOD;YACPlC,IAAIkC,MAAM,+BAA+BA;AAC3C;AACF;IAEAnB,kBAAqBb,UAAW,mLAIbkC,KAAKC,UAAUnC;;;"}