@valbuild/cli 0.12.0 → 0.13.3

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@valbuild/cli",
-  "version": "0.12.0",
+  "private": false,
+  "version": "0.13.3",
   "description": "Val CLI tools",
   "bin": {
     "val": "./bin.js"
@@ -16,7 +17,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@valbuild/server": "~0.12.0",
+    "@valbuild/server": "~0.13.3",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",

package/src/cli.ts

@@ -0,0 +1,122 @@
+import path from "path";
+import meow from "meow";
+import { createRequestHandler, createService } from "@valbuild/server";
+import { error, info } from "./logger";
+import express from "express";
+import cors from "cors";
+import { createServer, Server } from "node:http";
+import { LocalValServer } from "@valbuild/server/src/LocalValServer";
+
+async function serve({
+  root,
+  port,
+  cfg,
+}: {
+  root?: string;
+  port: number;
+  cfg?: string;
+}): Promise<void> {
+  const projectRoot = root ? path.resolve(root) : process.cwd();
+  const service = await createService(projectRoot, {
+    valConfigPath: cfg ?? "./val.config",
+  });
+  const valReqHandler = createRequestHandler(
+    new LocalValServer({
+      service,
+    })
+  );
+  const app = express();
+  // TODO: Properly configure CORS
+  app.use(cors(), valReqHandler);
+  const server: Server = createServer(app);
+  await new Promise<void>((resolve) => {
+    server.listen(port, resolve);
+  });
+
+  info(`Root is ${projectRoot}`);
+  info(`Config is ${service.valConfigPath}`);
+  info(`Listening on port ${port}`);
+
+  let handled = false;
+  const handleInterrupt: NodeJS.SignalsListener = async () => {
+    if (handled) return;
+    handled = true;
+
+    info("Shutting down...");
+
+    server.close((err) => {
+      if (!err) return;
+      error(err.toString());
+    });
+  };
+
+  process.on("SIGINT", handleInterrupt);
+  process.on("SIGTERM", handleInterrupt);
+
+  return new Promise((resolve) => {
+    server.on("close", () => {
+      service.dispose();
+      resolve();
+    });
+  });
+}
+
+async function main(): Promise<void> {
+  const { input, flags, showHelp } = meow(
+    `
+      Usage
+        $ val [command]
+      Commands
+        serve    Run val development server
+
+      Options
+        --help                   Show this message
+        --port [port], -p [port] Set server port (default 4123)
+        --root [root], -r [root] Set project root directory (default process.cwd())
+        --cfg  [cfg],  -c [cfg]  Set path to config relative to root (default ./val.config)
+    `,
+    {
+      flags: {
+        port: {
+          type: "number",
+          alias: "p",
+          default: 4123,
+        },
+        root: {
+          type: "string",
+          alias: "r",
+        },
+        cfg: {
+          type: "string",
+          alias: "c",
+        },
+      },
+      hardRejection: false,
+    }
+  );
+
+  if (input.length === 0) {
+    return showHelp();
+  }
+
+  if (input.length !== 1) {
+    return error(`Unknown command "${input.join(" ")}"`);
+  }
+
+  const [command] = input;
+  switch (command) {
+    case "serve":
+      return serve({
+        root: flags.root,
+        port: flags.port,
+        cfg: flags.cfg,
+      });
+    default:
+      return error(`Unknown command "${input.join(" ")}"`);
+  }
+}
+
+void main().catch((err) => {
+  error(err);
+  process.exitCode = 1;
+});

package/src/logger.ts

@@ -0,0 +1,9 @@
+import chalk from "chalk";
+
+export function error(...message: string[]) {
+  console.error(chalk.red(...message));
+}
+
+export function info(...message: string[]) {
+  console.log(...message);
+}