zero-query 1.1.1 → 1.2.2

package/cli/commands/dev/index.js

@@ -1,107 +1,107 @@
-/**
- * cli/commands/dev/index.js - Dev server orchestrator
- *
- * Ties together the HTTP server, file watcher, logger, and overlay
- * to provide a complete development environment with live-reload,
- * syntax validation, and a full-screen error overlay that surfaces
- * both build-time and runtime ZQueryErrors.
- */
-
-'use strict';
-
-const fs   = require('fs');
-const path = require('path');
-
-const { args, flag, option } = require('../../args');
-const { createServer }       = require('./server');
-const { startWatcher }       = require('./watcher');
-const { printBanner }        = require('./logger');
-const bundleApp              = require('../bundle');
-
-// ---------------------------------------------------------------------------
-// Resolve project root
-// ---------------------------------------------------------------------------
-
-function resolveRoot(htmlEntry) {
-  // Explicit positional argument  →  zquery dev <dir>
-  for (let i = 1; i < args.length; i++) {
-    const prev = args[i - 1];
-    if (!args[i].startsWith('-') && prev !== '-p' && prev !== '--port' && prev !== '--index' && prev !== '-i') {
-      return path.resolve(process.cwd(), args[i]);
-    }
-  }
-
-  // Auto-detect: first candidate that contains the HTML entry file
-  const candidates = [
-    process.cwd(),
-    path.join(process.cwd(), 'public'),
-    path.join(process.cwd(), 'src'),
-  ];
-  for (const c of candidates) {
-    if (fs.existsSync(path.join(c, htmlEntry))) return c;
-  }
-  return process.cwd();
-}
-
-// ---------------------------------------------------------------------------
-// devServer - main entry point (called from cli/index.js)
-// ---------------------------------------------------------------------------
-
-async function devServer() {
-  const htmlEntry   = option('index', 'i', 'index.html');
-  const port        = parseInt(option('port', 'p', '3100'), 10);
-  const noIntercept = flag('no-intercept');
-  const bundleMode  = flag('bundle', 'b');
-  const root        = resolveRoot(htmlEntry);
-
-  // In bundle mode, build the app first then serve from dist/server/
-  let serveRoot = root;
-  if (bundleMode) {
-    console.log('\n  Building bundled app...\n');
-    // Clear the shared args array so the bundler auto-detects entry from cwd
-    // instead of re-parsing the dev command's positional args
-    const { args: cliArgs } = require('../../args');
-    const savedArgs = cliArgs.slice();
-    cliArgs.length = 0;
-    cliArgs.push('bundle');
-    const prevCwd = process.cwd();
-    try {
-      process.chdir(root);
-      bundleApp();
-    } finally {
-      process.chdir(prevCwd);
-      cliArgs.length = 0;
-      savedArgs.forEach(a => cliArgs.push(a));
-    }
-    serveRoot = path.join(root, 'dist', 'server');
-  }
-
-  // Start HTTP server + SSE pool
-  const { app, pool, listen } = await createServer({ root: serveRoot, htmlEntry, port, noIntercept });
-
-  // Start file watcher (watches source root, rebuilds in bundle mode)
-  const watcher = startWatcher({ root, pool, bundleMode, serveRoot });
-
-  // Boot
-  listen(() => {
-    printBanner({
-      port,
-      root:          path.relative(process.cwd(), root) || '.',
-      htmlEntry,
-      noIntercept,
-      bundleMode,
-      watchDirCount: watcher.dirs.length,
-    });
-  });
-
-  // Graceful shutdown
-  process.on('SIGINT', () => {
-    console.log('\n  Shutting down...');
-    watcher.destroy();
-    pool.closeAll();
-    app.close(() => process.exit(0));
-    setTimeout(() => process.exit(0), 1000);
-  });
-}
-
-module.exports = devServer;
+/**
+ * cli/commands/dev/index.js - Dev server orchestrator
+ *
+ * Ties together the HTTP server, file watcher, logger, and overlay
+ * to provide a complete development environment with live-reload,
+ * syntax validation, and a full-screen error overlay that surfaces
+ * both build-time and runtime ZQueryErrors.
+ */
+
+'use strict';
+
+const fs   = require('fs');
+const path = require('path');
+
+const { args, flag, option } = require('../../args');
+const { createServer }       = require('./server');
+const { startWatcher }       = require('./watcher');
+const { printBanner }        = require('./logger');
+const bundleApp              = require('../bundle');
+
+// ---------------------------------------------------------------------------
+// Resolve project root
+// ---------------------------------------------------------------------------
+
+function resolveRoot(htmlEntry) {
+  // Explicit positional argument  →  zquery dev <dir>
+  for (let i = 1; i < args.length; i++) {
+    const prev = args[i - 1];
+    if (!args[i].startsWith('-') && prev !== '-p' && prev !== '--port' && prev !== '--index' && prev !== '-i') {
+      return path.resolve(process.cwd(), args[i]);
+    }
+  }
+
+  // Auto-detect: first candidate that contains the HTML entry file
+  const candidates = [
+    process.cwd(),
+    path.join(process.cwd(), 'public'),
+    path.join(process.cwd(), 'src'),
+  ];
+  for (const c of candidates) {
+    if (fs.existsSync(path.join(c, htmlEntry))) return c;
+  }
+  return process.cwd();
+}
+
+// ---------------------------------------------------------------------------
+// devServer - main entry point (called from cli/index.js)
+// ---------------------------------------------------------------------------
+
+async function devServer() {
+  const htmlEntry   = option('index', 'i', 'index.html');
+  const port        = parseInt(option('port', 'p', '3100'), 10);
+  const noIntercept = flag('no-intercept');
+  const bundleMode  = flag('bundle', 'b');
+  const root        = resolveRoot(htmlEntry);
+
+  // In bundle mode, build the app first then serve from dist/server/
+  let serveRoot = root;
+  if (bundleMode) {
+    console.log('\n  Building bundled app...\n');
+    // Clear the shared args array so the bundler auto-detects entry from cwd
+    // instead of re-parsing the dev command's positional args
+    const { args: cliArgs } = require('../../args');
+    const savedArgs = cliArgs.slice();
+    cliArgs.length = 0;
+    cliArgs.push('bundle');
+    const prevCwd = process.cwd();
+    try {
+      process.chdir(root);
+      bundleApp();
+    } finally {
+      process.chdir(prevCwd);
+      cliArgs.length = 0;
+      savedArgs.forEach(a => cliArgs.push(a));
+    }
+    serveRoot = path.join(root, 'dist', 'server');
+  }
+
+  // Start HTTP server + SSE pool
+  const { app, pool, listen } = await createServer({ root: serveRoot, htmlEntry, port, noIntercept });
+
+  // Start file watcher (watches source root, rebuilds in bundle mode)
+  const watcher = startWatcher({ root, pool, bundleMode, serveRoot });
+
+  // Boot
+  listen(() => {
+    printBanner({
+      port,
+      root:          path.relative(process.cwd(), root) || '.',
+      htmlEntry,
+      noIntercept,
+      bundleMode,
+      watchDirCount: watcher.dirs.length,
+    });
+  });
+
+  // Graceful shutdown
+  process.on('SIGINT', () => {
+    console.log('\n  Shutting down...');
+    watcher.destroy();
+    pool.closeAll();
+    app.close(() => process.exit(0));
+    setTimeout(() => process.exit(0), 1000);
+  });
+}
+
+module.exports = devServer;

package/cli/commands/dev/logger.js

@@ -1,75 +1,75 @@
-/**
- * cli/commands/dev/logger.js - Terminal output helpers
- *
- * Provides styled console output for the dev server: startup banner,
- * timestamped file-change messages, and error formatting.
- */
-
-'use strict';
-
-// ANSI colour helpers (works on all modern terminals)
-const c = {
-  reset:   '\x1b[0m',
-  bold:    '\x1b[1m',
-  dim:     '\x1b[2m',
-  red:     '\x1b[31m',
-  green:   '\x1b[32m',
-  yellow:  '\x1b[33m',
-  cyan:    '\x1b[36m',
-  magenta: '\x1b[35m',
-};
-
-function timestamp() {
-  return new Date().toLocaleTimeString();
-}
-
-// ---------------------------------------------------------------------------
-// Event-level log helpers
-// ---------------------------------------------------------------------------
-
-function logCSS(relPath) {
-  console.log(`  ${timestamp()}  ${c.magenta} css ${c.reset} ${relPath}`);
-}
-
-function logReload(relPath) {
-  console.log(`  ${timestamp()}  ${c.cyan} reload ${c.reset} ${relPath}`);
-}
-
-function logError(descriptor) {
-  const t = timestamp();
-  console.log(`  ${t}  ${c.red} error ${c.reset} ${descriptor.file}`);
-  console.log(`         ${c.red}${descriptor.type}: ${descriptor.message}${c.reset}`);
-  if (descriptor.line) {
-    console.log(`         ${c.dim}at line ${descriptor.line}${descriptor.column ? ':' + descriptor.column : ''}${c.reset}`);
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Startup banner
-// ---------------------------------------------------------------------------
-
-function printBanner({ port, root, htmlEntry, noIntercept, bundleMode, watchDirCount }) {
-  const rule = c.dim + '-'.repeat(40) + c.reset;
-  console.log(`\n  ${c.bold}zQuery Dev Server${c.reset}`);
-  console.log(`  ${rule}`);
-  console.log(`  Local:       ${c.cyan}http://localhost:${port}/${c.reset}`);
-  console.log(`  DevTools:    ${c.cyan}http://localhost:${port}/_devtools${c.reset}`);
-  console.log(`  Root:        ${root}`);
-  if (bundleMode) {
-    console.log(`  Mode:        ${c.yellow}bundled${c.reset} (serving from dist/server/)`);
-  }
-  if (htmlEntry !== 'index.html') {
-    console.log(`  HTML:        ${c.cyan}${htmlEntry}${c.reset}`);
-  }
-  console.log(`  Live Reload: ${c.green}enabled${c.reset} (SSE)`);
-  console.log(`  Overlay:     ${c.green}enabled${c.reset} (syntax + runtime + ZQueryError)`);
-  console.log(`  Fetch Log:   ${c.green}enabled${c.reset} (auto-intercept all fetch/$.http)`);
-  if (noIntercept) {
-    console.log(`  Intercept:   ${c.yellow}disabled${c.reset} (--no-intercept)`);
-  }
-  console.log(`  Watching:    all files in ${watchDirCount} director${watchDirCount === 1 ? 'y' : 'ies'}`);
-  console.log(`  ${rule}`);
-  console.log(`  Press Ctrl+C to stop\n`);
-}
-
-module.exports = { logCSS, logReload, logError, printBanner };
+/**
+ * cli/commands/dev/logger.js - Terminal output helpers
+ *
+ * Provides styled console output for the dev server: startup banner,
+ * timestamped file-change messages, and error formatting.
+ */
+
+'use strict';
+
+// ANSI colour helpers (works on all modern terminals)
+const c = {
+  reset:   '\x1b[0m',
+  bold:    '\x1b[1m',
+  dim:     '\x1b[2m',
+  red:     '\x1b[31m',
+  green:   '\x1b[32m',
+  yellow:  '\x1b[33m',
+  cyan:    '\x1b[36m',
+  magenta: '\x1b[35m',
+};
+
+function timestamp() {
+  return new Date().toLocaleTimeString();
+}
+
+// ---------------------------------------------------------------------------
+// Event-level log helpers
+// ---------------------------------------------------------------------------
+
+function logCSS(relPath) {
+  console.log(`  ${timestamp()}  ${c.magenta} css ${c.reset} ${relPath}`);
+}
+
+function logReload(relPath) {
+  console.log(`  ${timestamp()}  ${c.cyan} reload ${c.reset} ${relPath}`);
+}
+
+function logError(descriptor) {
+  const t = timestamp();
+  console.log(`  ${t}  ${c.red} error ${c.reset} ${descriptor.file}`);
+  console.log(`         ${c.red}${descriptor.type}: ${descriptor.message}${c.reset}`);
+  if (descriptor.line) {
+    console.log(`         ${c.dim}at line ${descriptor.line}${descriptor.column ? ':' + descriptor.column : ''}${c.reset}`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Startup banner
+// ---------------------------------------------------------------------------
+
+function printBanner({ port, root, htmlEntry, noIntercept, bundleMode, watchDirCount }) {
+  const rule = c.dim + '-'.repeat(40) + c.reset;
+  console.log(`\n  ${c.bold}zQuery Dev Server${c.reset}`);
+  console.log(`  ${rule}`);
+  console.log(`  Local:       ${c.cyan}http://localhost:${port}/${c.reset}`);
+  console.log(`  DevTools:    ${c.cyan}http://localhost:${port}/_devtools${c.reset}`);
+  console.log(`  Root:        ${root}`);
+  if (bundleMode) {
+    console.log(`  Mode:        ${c.yellow}bundled${c.reset} (serving from dist/server/)`);
+  }
+  if (htmlEntry !== 'index.html') {
+    console.log(`  HTML:        ${c.cyan}${htmlEntry}${c.reset}`);
+  }
+  console.log(`  Live Reload: ${c.green}enabled${c.reset} (SSE)`);
+  console.log(`  Overlay:     ${c.green}enabled${c.reset} (syntax + runtime + ZQueryError)`);
+  console.log(`  Fetch Log:   ${c.green}enabled${c.reset} (auto-intercept all fetch/$.http)`);
+  if (noIntercept) {
+    console.log(`  Intercept:   ${c.yellow}disabled${c.reset} (--no-intercept)`);
+  }
+  console.log(`  Watching:    all files in ${watchDirCount} director${watchDirCount === 1 ? 'y' : 'ies'}`);
+  console.log(`  ${rule}`);
+  console.log(`  Press Ctrl+C to stop\n`);
+}
+
+module.exports = { logCSS, logReload, logError, printBanner };