@boon4681/giri 0.0.2-alpha-1 → 0.0.2-alpha-2

package/dist/cli.js

@@ -461,29 +461,44 @@ var safeRegister = async () => {
   await assertES5(res.unregister);
   return res;
 };
-var load = async () => {
-  const defaultTsConfigExists = (0, import_node_fs.existsSync)((0, import_node_path.resolve)("giri.config.ts"));
-  const defaultJsConfigExists = (0, import_node_fs.existsSync)((0, import_node_path.resolve)("giri.config.js"));
-  const defaultConfigPath = defaultTsConfigExists ? "giri.config.ts" : defaultJsConfigExists ? "giri.config.js" : void 0;
-  if (!defaultConfigPath) {
-    import_prompts.log.error("Config file not found.");
-    (0, import_node_process.exit)(1);
+var findConfigPath = (cwd = (0, import_node_path.resolve)()) => {
+  for (const name of ["giri.config.ts", "giri.config.js"]) {
+    const path = (0, import_node_path.resolve)(cwd, name);
+    if ((0, import_node_fs.existsSync)(path)) {
+      return path;
+    }
   }
-  const path = (0, import_node_path.resolve)(defaultConfigPath);
-  if (!(0, import_node_fs.existsSync)(path)) {
-    import_prompts.log.error(`${path} file does not exist`);
+  return void 0;
+};
+var load = async (opts = {}) => {
+  const fail = (message) => {
+    if (opts.throwOnError) {
+      throw new Error(message);
+    }
+    import_prompts.log.error(message);
     (0, import_node_process.exit)(1);
+  };
+  const path = findConfigPath();
+  if (!path) {
+    fail("Config file not found.");
   }
   const { unregister } = await safeRegister();
-  const required = require(`${path}`);
-  const content = required.default ?? required;
+  let content;
+  try {
+    const required = require(`${path}`);
+    content = required.default ?? required;
+  } finally {
+  }
   unregister();
   const res = import_value.Value.Check(configSchema, content);
   if (!res) {
-    for (const error of [...import_value.Value.Errors(configSchema, content)]) {
-      import_prompts.log.error(error.message);
+    const messages = [...import_value.Value.Errors(configSchema, content)].map((error) => error.message);
+    if (!opts.throwOnError) {
+      for (const message of messages) {
+        import_prompts.log.error(message);
+      }
     }
-    (0, import_node_process.exit)(1);
+    fail(messages.join("\n"));
   }
   return content;
 };
@@ -2027,69 +2042,120 @@ function displayHost(address) {
   return address.includes(":") ? `[${address}]` : address;
 }
 async function serveProject(config, flags) {
-  const initial = await syncProject(config);
-  log2.success(
-    `synced ${initial.routes.length} route${initial.routes.length === 1 ? "" : "s"} ${muted(`at ${initial.paths.outDir}`)}`,
-    "sync"
-  );
-  const lifecycle = await loadLifecycle();
-  const services = await runInit(lifecycle);
-  let current = await buildGiriApp(config, { services });
-  const port = flags.port ?? config.server?.port ?? 3e3;
-  const hostname = flags.hostname ?? config.server?.hostname;
-  if (flags.watch) {
-    const srcDir = (0, import_node_path15.resolve)(current.paths.routesDir, "..");
-    if ((0, import_node_fs9.existsSync)(srcDir)) {
-      let timer;
-      let syncing = false;
-      const changed = /* @__PURE__ */ new Set();
-      const { watch } = await import("fs");
-      const updater = createWatchUpdater(config, initial);
-      const hmrCount = /* @__PURE__ */ new Map();
-      const bump = (key) => {
-        const next = (hmrCount.get(key) ?? 0) + 1;
-        hmrCount.set(key, next);
-        return next;
-      };
-      const flush = async () => {
-        if (syncing) {
-          return;
-        }
-        syncing = true;
-        try {
-          while (changed.size > 0) {
-            const batch = [...changed];
-            changed.clear();
-            for (const name of batch) {
-              const outcome = await updater.apply(name || null);
-              const rel = name ? `src/${name.replace(/\\/g, "/")}` : "src";
-              log2.change(outcome === "full" ? "sync" : "update", rel, bump(rel));
+  const { watch } = await import("fs");
+  let stop;
+  const boot = async (cfg) => {
+    const initial = await syncProject(cfg);
+    log2.success(
+      `synced ${initial.routes.length} route${initial.routes.length === 1 ? "" : "s"} ${muted(`at ${initial.paths.outDir}`)}`,
+      "sync"
+    );
+    const lifecycle = await loadLifecycle();
+    const services = await runInit(lifecycle);
+    let current = await buildGiriApp(cfg, { services });
+    const port = flags.port ?? cfg.server?.port ?? 3e3;
+    const hostname = flags.hostname ?? cfg.server?.hostname;
+    const closers = [];
+    if (flags.watch) {
+      const srcDir = (0, import_node_path15.resolve)(current.paths.routesDir, "..");
+      if ((0, import_node_fs9.existsSync)(srcDir)) {
+        let timer;
+        let syncing = false;
+        const changed = /* @__PURE__ */ new Set();
+        const updater = createWatchUpdater(cfg, initial);
+        const hmrCount = /* @__PURE__ */ new Map();
+        const bump = (key) => {
+          const next = (hmrCount.get(key) ?? 0) + 1;
+          hmrCount.set(key, next);
+          return next;
+        };
+        const flush = async () => {
+          if (syncing) {
+            return;
+          }
+          syncing = true;
+          try {
+            while (changed.size > 0) {
+              const batch = [...changed];
+              changed.clear();
+              for (const name of batch) {
+                const outcome = await updater.apply(name || null);
+                const rel = name ? `src/${name.replace(/\\/g, "/")}` : "src";
+                log2.change(outcome === "full" ? "sync" : "update", rel, bump(rel));
+              }
+              current = await buildGiriApp(cfg, { services });
             }
-            current = await buildGiriApp(config, { services });
+          } catch (error) {
+            log2.error(error instanceof Error ? error.message : String(error), "watch");
+          } finally {
+            syncing = false;
           }
-        } catch (error) {
-          log2.error(error instanceof Error ? error.message : String(error), "watch");
-        } finally {
-          syncing = false;
-        }
-        if (changed.size > 0) {
-          void flush();
-        }
-      };
-      watch(srcDir, { recursive: true }, (_event, filename) => {
-        changed.add(filename ? filename.toString() : "");
-        clearTimeout(timer);
-        timer = setTimeout(() => void flush(), 150);
-      });
+          if (changed.size > 0) {
+            void flush();
+          }
+        };
+        const watcher = watch(srcDir, { recursive: true }, (_event, filename) => {
+          changed.add(filename ? filename.toString() : "");
+          clearTimeout(timer);
+          timer = setTimeout(() => void flush(), 150);
+        });
+        closers.push(() => {
+          clearTimeout(timer);
+          watcher.close();
+        });
+      }
     }
+    const handler = (request) => cfg.adapter.fetch(current.app, request);
+    const server = cfg.adapter.serve(handler, { port, hostname }, (info) => {
+      log2.ready(`http://${displayHost(info.address)}:${info.port}`);
+    });
+    stop = async () => {
+      for (const close of closers) {
+        await close();
+      }
+      try {
+        await server.close();
+      } catch {
+      }
+      if (lifecycle.teardown) {
+        await lifecycle.teardown(services);
+      }
+    };
+  };
+  await boot(config);
+  const configPath = flags.watch ? findConfigPath((0, import_node_path15.resolve)(process.cwd())) : void 0;
+  if (configPath) {
+    let timer;
+    let restarting = false;
+    const configName = (0, import_node_path15.basename)(configPath);
+    const restart = async () => {
+      if (restarting) {
+        return;
+      }
+      restarting = true;
+      try {
+        log2.info(`${color.green("restart")} ${configName} changed`, "config");
+        delete require.cache[configPath];
+        const next = await load({ throwOnError: true });
+        await stop?.();
+        await boot(next);
+      } catch (error) {
+        log2.error(error instanceof Error ? error.message : String(error), "config");
+        log2.info("kept the previous server running \u2014 fix the config and save again", "config");
+      } finally {
+        restarting = false;
+      }
+    };
+    watch((0, import_node_path15.dirname)(configPath), { recursive: false }, (_event, filename) => {
+      if (filename && (0, import_node_path15.basename)(filename.toString()) === configName) {
+        clearTimeout(timer);
+        timer = setTimeout(() => void restart(), 150);
+      }
+    });
   }
-  const handler = (request) => config.adapter.fetch(current.app, request);
-  const server = config.adapter.serve(handler, { port, hostname }, (info) => {
-    log2.ready(`http://${displayHost(info.address)}:${info.port}`);
-  });
-  registerShutdown(server, lifecycle, services);
+  registerShutdown(() => stop?.());
 }
-function registerShutdown(server, lifecycle, services) {
+function registerShutdown(cleanup) {
   let shuttingDown = false;
   const shutdown = async () => {
     if (shuttingDown) {
@@ -2097,10 +2163,7 @@ function registerShutdown(server, lifecycle, services) {
     }
     shuttingDown = true;
     try {
-      await server.close();
-      if (lifecycle.teardown) {
-        await lifecycle.teardown(services);
-      }
+      await cleanup();
     } catch (error) {
       log2.error(error instanceof Error ? error.message : String(error));
       process.exitCode = 1;