@flight-framework/cli 0.0.12 → 0.0.14

package/README.md

@@ -1,77 +1,77 @@
-# @flight-framework/cli
-
-Command-line interface for Flight Framework.
-
-## Installation
-
-```bash
-npm install -g @flight-framework/cli
-```
-
-Or use via npx:
-
-```bash
-npx @flight-framework/cli <command>
-```
-
-## Commands
-
-### create
-
-Create a new Flight project.
-
-```bash
-flight create [project-name]
-```
-
-Options:
-
-| Option | Description |
-|--------|-------------|
-| `--ui <framework>` | UI framework: react, vue, svelte, solid, preact, qwik, lit, htmx |
-| `--typescript` | Use TypeScript (default) |
-| `--no-typescript` | Use JavaScript |
-
-### dev
-
-Start the development server.
-
-```bash
-flight dev
-```
-
-Options:
-
-| Option | Description | Default |
-|--------|-------------|---------|
-| `-p, --port` | Port number | `5173` |
-| `-h, --host` | Host to bind | `localhost` |
-| `--open` | Open browser | `false` |
-| `--ssr` | Enable SSR | From config |
-
-### build
-
-Build for production.
-
-```bash
-flight build
-```
-
-### start
-
-Start the production server.
-
-```bash
-flight start
-```
-
-Options:
-
-| Option | Description | Default |
-|--------|-------------|---------|
-| `-p, --port` | Port number | `3000` |
-| `-h, --host` | Host to bind | `0.0.0.0` |
-
-## License
-
-MIT
+# @flight-framework/cli
+
+Command-line interface for Flight Framework.
+
+## Installation
+
+```bash
+npm install -g @flight-framework/cli
+```
+
+Or use via npx:
+
+```bash
+npx @flight-framework/cli <command>
+```
+
+## Commands
+
+### create
+
+Create a new Flight project.
+
+```bash
+flight create [project-name]
+```
+
+Options:
+
+| Option | Description |
+|--------|-------------|
+| `--ui <framework>` | UI framework: react, vue, svelte, solid, preact, qwik, lit, htmx |
+| `--typescript` | Use TypeScript (default) |
+| `--no-typescript` | Use JavaScript |
+
+### dev
+
+Start the development server.
+
+```bash
+flight dev
+```
+
+Options:
+
+| Option | Description | Default |
+|--------|-------------|---------|
+| `-p, --port` | Port number | `5173` |
+| `-h, --host` | Host to bind | `localhost` |
+| `--open` | Open browser | `false` |
+| `--ssr` | Enable SSR | From config |
+
+### build
+
+Build for production.
+
+```bash
+flight build
+```
+
+### start
+
+Start the production server.
+
+```bash
+flight start
+```
+
+Options:
+
+| Option | Description | Default |
+|--------|-------------|---------|
+| `-p, --port` | Port number | `3000` |
+| `-h, --host` | Host to bind | `0.0.0.0` |
+
+## License
+
+MIT

package/dist/bin.js

@@ -879,6 +879,421 @@ async function routesGenerateCommand(options = {}) {
   }
 }
 
+// src/commands/types-generate.ts
+import { resolve as resolve7 } from "path";
+
+// src/generators/typegen.ts
+import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, readdirSync as readdirSync3, watch } from "fs";
+import { join as join4 } from "path";
+function generateHeader(command) {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  return `/**
+ * Auto-generated by Flight CLI
+ * Do not edit manually - changes will be overwritten
+ *
+ * Command: ${command}
+ * Generated: ${timestamp}
+ */`;
+}
+function extractParams(routePath) {
+  const params = [];
+  const dynamicMatches = routePath.match(/:(\w+)/g);
+  if (dynamicMatches) {
+    params.push(...dynamicMatches.map((m) => m.slice(1)));
+  }
+  const catchAllMatches = routePath.match(/\*(\w+)/g);
+  if (catchAllMatches) {
+    params.push(...catchAllMatches.map((m) => m.slice(1)));
+  }
+  return params;
+}
+function isDynamicRoute(routePath) {
+  return routePath.includes(":") || routePath.includes("*");
+}
+function generateRouteTypes(routes) {
+  const pageRoutes = routes.filter((r) => !r.isApiRoute);
+  const apiRoutes = routes.filter((r) => r.isApiRoute);
+  const staticRoutes = pageRoutes.filter((r) => !r.isDynamic);
+  const dynamicRoutes = pageRoutes.filter((r) => r.isDynamic);
+  const appRoutesUnion = pageRoutes.length > 0 ? pageRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const apiRoutesUnion = apiRoutes.length > 0 ? apiRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const staticRoutesUnion = staticRoutes.length > 0 ? staticRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const dynamicRoutesUnion = dynamicRoutes.length > 0 ? dynamicRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const paramTypes = dynamicRoutes.map((r) => {
+    const params = extractParams(r.path);
+    const typeName = routePathToTypeName(r.path);
+    const paramDef = params.map((p) => `${p}: string`).join("; ");
+    return `export type ${typeName}Params = { ${paramDef} };`;
+  }).join("\n");
+  return `${generateHeader("flight types:generate --routes")}
+
+// ============================================================================
+// Route Types
+// ============================================================================
+
+/**
+ * All available page routes in the application
+ */
+export type AppRoutes =
+${appRoutesUnion};
+
+/**
+ * All available API routes in the application
+ */
+export type ApiRoutes =
+${apiRoutesUnion};
+
+/**
+ * Static routes (no dynamic parameters)
+ */
+export type StaticRoutes =
+${staticRoutesUnion};
+
+/**
+ * Dynamic routes (with parameters like :id or *slug)
+ */
+export type DynamicRoutes =
+${dynamicRoutesUnion};
+
+// ============================================================================
+// Route Parameter Extraction
+// ============================================================================
+
+/**
+ * Extract route parameters from a route pattern using template literal types.
+ *
+ * @example
+ * type Params = ExtractRouteParams<'/users/:id'>; // { id: string }
+ * type BlogParams = ExtractRouteParams<'/blog/:year/:slug'>; // { year: string; slug: string }
+ */
+type ExtractRouteParams<T extends string> =
+    // Handle :param/rest pattern
+    T extends \`\${infer _Start}:\${infer Param}/\${infer Rest}\`
+        ? { [K in Param]: string } & ExtractRouteParams<\`/\${Rest}\`>
+        // Handle :param at end
+        : T extends \`\${infer _Start}:\${infer Param}\`
+            ? { [K in Param]: string }
+            // Handle *param (catch-all)
+            : T extends \`\${infer _Start}*\${infer Param}\`
+                ? { [K in Param]: string }
+                // No params
+                : Record<string, never>;
+
+/**
+ * Get typed parameters for a specific route.
+ *
+ * @example
+ * const params: RouteParams<'/users/:id'> = { id: '123' };
+ */
+export type RouteParams<T extends AppRoutes | ApiRoutes> = ExtractRouteParams<T>;
+
+// ============================================================================
+// Helper Types
+// ============================================================================
+
+/**
+ * Check if a route requires parameters
+ */
+export type RequiresParams<T extends AppRoutes | ApiRoutes> =
+    RouteParams<T> extends Record<string, never> ? false : true;
+
+/**
+ * Props for a type-safe Link component
+ */
+export type TypedLinkProps<T extends AppRoutes> =
+    RequiresParams<T> extends true
+        ? { to: T; params: RouteParams<T> }
+        : { to: T; params?: never };
+
+/**
+ * Build a URL from a route pattern and parameters
+ */
+export type BuildUrl<T extends AppRoutes> =
+    RequiresParams<T> extends true
+        ? (route: T, params: RouteParams<T>) => string
+        : (route: T) => string;
+
+// ============================================================================
+// Individual Route Parameter Types
+// ============================================================================
+
+${paramTypes || "// No dynamic routes found"}
+`;
+}
+function routePathToTypeName(routePath) {
+  return routePath.split("/").filter(Boolean).map((segment) => {
+    const clean = segment.replace(/^[:*]/, "");
+    return clean.charAt(0).toUpperCase() + clean.slice(1);
+  }).join("_") || "Root";
+}
+function parseEnvFile(content) {
+  const server = [];
+  const client = [];
+  const lines = content.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
+    }
+    const match = trimmed.match(/^([A-Z_][A-Z0-9_]*)(\?)?=/i);
+    if (!match) {
+      continue;
+    }
+    const key = match[1];
+    const optional = match[2] === "?";
+    const envVar = { key, optional };
+    if (key.startsWith("PUBLIC_")) {
+      client.push(envVar);
+    } else {
+      server.push(envVar);
+    }
+  }
+  return { server, client };
+}
+function loadEnvFiles(projectRoot) {
+  const envFiles = [".env", ".env.local", ".env.development", ".env.production"];
+  const merged = { server: [], client: [] };
+  const seenKeys = /* @__PURE__ */ new Set();
+  for (const envFile of envFiles) {
+    const envPath = join4(projectRoot, envFile);
+    if (!existsSync5(envPath)) {
+      continue;
+    }
+    const content = readFileSync3(envPath, "utf-8");
+    const parsed = parseEnvFile(content);
+    for (const envVar of parsed.server) {
+      if (!seenKeys.has(envVar.key)) {
+        seenKeys.add(envVar.key);
+        merged.server.push(envVar);
+      }
+    }
+    for (const envVar of parsed.client) {
+      if (!seenKeys.has(envVar.key)) {
+        seenKeys.add(envVar.key);
+        merged.client.push(envVar);
+      }
+    }
+  }
+  return merged;
+}
+function generateEnvTypes(env) {
+  const serverVars = env.server.sort((a, b) => a.key.localeCompare(b.key)).map((v) => `        ${v.key}${v.optional ? "?" : ""}: string;`).join("\n");
+  const clientVars = env.client.sort((a, b) => a.key.localeCompare(b.key)).map((v) => `    ${v.key}${v.optional ? "?" : ""}: string;`).join("\n");
+  return `${generateHeader("flight types:generate --env")}
+
+// ============================================================================
+// Server-side Environment Variables
+// ============================================================================
+
+/**
+ * Server-side environment variables accessible via process.env
+ * These are NOT exposed to the client.
+ */
+declare namespace NodeJS {
+    interface ProcessEnv {
+${serverVars || "        // No server environment variables defined"}
+    }
+}
+
+// ============================================================================
+// Client-side Environment Variables
+// ============================================================================
+
+/**
+ * Client-side environment variables accessible via import.meta.env
+ * Only variables with PUBLIC_ prefix are included.
+ */
+interface ImportMetaEnv {
+${clientVars || "    // No client environment variables defined"}
+}
+
+interface ImportMeta {
+    readonly env: ImportMetaEnv;
+}
+`;
+}
+function scanRoutesForTypes(routesDir) {
+  if (!existsSync5(routesDir)) {
+    return [];
+  }
+  const routes = [];
+  scanDirectoryRecursive(routesDir, "", routes);
+  return routes;
+}
+function scanDirectoryRecursive(dir, basePath, results) {
+  const entries = readdirSync3(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = join4(dir, entry.name);
+    const relativePath = join4(basePath, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name.startsWith(".") || entry.name === "node_modules") {
+        continue;
+      }
+      scanDirectoryRecursive(fullPath, relativePath, results);
+    } else if (entry.isFile()) {
+      const route = parseRouteFile(entry.name, relativePath);
+      if (route) {
+        results.push(route);
+      }
+    }
+  }
+}
+function parseRouteFile(filename, relativePath) {
+  if (/\.(page|route)\.(tsx?|jsx?)$/.test(filename)) {
+    const urlPath = filePathToUrlPath2(relativePath);
+    return {
+      path: urlPath,
+      filePath: relativePath.replace(/\\/g, "/"),
+      isDynamic: isDynamicRoute(urlPath),
+      isApiRoute: false
+    };
+  }
+  const apiMatch = filename.match(/\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/i);
+  if (apiMatch) {
+    const urlPath = filePathToUrlPath2(relativePath);
+    return {
+      path: urlPath,
+      filePath: relativePath.replace(/\\/g, "/"),
+      isDynamic: isDynamicRoute(urlPath),
+      isApiRoute: true,
+      httpMethod: apiMatch[1].toUpperCase()
+    };
+  }
+  return null;
+}
+function filePathToUrlPath2(filePath) {
+  let urlPath = filePath.replace(/\\/g, "/").replace(/\.(page|route)\.(tsx?|jsx?)$/, "").replace(/\.(get|post|put|patch|delete|options|head)$/i, "").replace(/\/index$/, "").replace(/^index$/, "").replace(/\/?\\?\([^)]+\\?\)/g, "").replace(/\[\.\.\.(\w+)\]/g, "*$1").replace(/\[(\w+)\]/g, ":$1");
+  if (!urlPath.startsWith("/")) {
+    urlPath = "/" + urlPath;
+  }
+  urlPath = urlPath.replace(/\/+/g, "/");
+  return urlPath || "/";
+}
+async function generateTypes(options) {
+  const {
+    routesDir,
+    outputDir,
+    includeRoutes = true,
+    includeEnv = false,
+    projectRoot = process.cwd()
+  } = options;
+  const result = {
+    routeTypes: "",
+    envTypes: "",
+    filesWritten: [],
+    routeCount: 0,
+    envVarCount: 0
+  };
+  if (!existsSync5(outputDir)) {
+    mkdirSync3(outputDir, { recursive: true });
+  }
+  if (includeRoutes) {
+    const routes = scanRoutesForTypes(routesDir);
+    result.routeCount = routes.length;
+    result.routeTypes = generateRouteTypes(routes);
+    const routeTypesPath = join4(outputDir, "routes.d.ts");
+    writeFileSync3(routeTypesPath, result.routeTypes, "utf-8");
+    result.filesWritten.push(routeTypesPath);
+    console.log(`Generated route types: ${routes.length} routes`);
+  }
+  if (includeEnv) {
+    const env = loadEnvFiles(projectRoot);
+    result.envVarCount = env.server.length + env.client.length;
+    result.envTypes = generateEnvTypes(env);
+    const envTypesPath = join4(outputDir, "env.d.ts");
+    writeFileSync3(envTypesPath, result.envTypes, "utf-8");
+    result.filesWritten.push(envTypesPath);
+    console.log(`Generated env types: ${env.server.length} server, ${env.client.length} client`);
+  }
+  return result;
+}
+function watchAndGenerate(options) {
+  const { routesDir, debounce = 100, onRegenerate } = options;
+  let timeout = null;
+  const regenerate = async () => {
+    try {
+      const result = await generateTypes(options);
+      onRegenerate?.(result);
+    } catch (error) {
+      console.error("Type generation failed:", error.message);
+    }
+  };
+  const debouncedRegenerate = () => {
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(regenerate, debounce);
+  };
+  regenerate();
+  const watcher = watch(routesDir, { recursive: true }, (eventType, filename) => {
+    if (filename && /\.(tsx?|jsx?)$/.test(filename)) {
+      console.log(`Route file changed: ${filename}`);
+      debouncedRegenerate();
+    }
+  });
+  return () => {
+    watcher.close();
+    if (timeout) clearTimeout(timeout);
+  };
+}
+
+// src/commands/types-generate.ts
+async function typesGenerateCommand(options = {}) {
+  const cwd = process.cwd();
+  const routesDir = options.routesDir ? resolve7(cwd, options.routesDir) : resolve7(cwd, "src/routes");
+  const outputDir = options.outputDir ? resolve7(cwd, options.outputDir) : resolve7(cwd, "src/.flight");
+  const includeRoutes = options.routes ?? !options.env;
+  const includeEnv = options.env ?? false;
+  console.log("Flight Type Generator");
+  console.log("---------------------");
+  console.log(`Routes directory: ${routesDir}`);
+  console.log(`Output directory: ${outputDir}`);
+  console.log(`Generate routes: ${includeRoutes}`);
+  console.log(`Generate env: ${includeEnv}`);
+  console.log("");
+  try {
+    if (options.watch) {
+      console.log("Watching for changes... (Ctrl+C to stop)");
+      console.log("");
+      const cleanup = watchAndGenerate({
+        routesDir,
+        outputDir,
+        includeRoutes,
+        includeEnv,
+        projectRoot: cwd,
+        onRegenerate: (result) => {
+          console.log(`Regenerated: ${result.filesWritten.length} files`);
+        }
+      });
+      process.on("SIGINT", () => {
+        console.log("\nStopping watch mode...");
+        cleanup();
+        process.exit(0);
+      });
+      await new Promise(() => {
+      });
+    } else {
+      const result = await generateTypes({
+        routesDir,
+        outputDir,
+        includeRoutes,
+        includeEnv,
+        projectRoot: cwd
+      });
+      console.log("Type generation complete!");
+      console.log("");
+      console.log("Files written:");
+      for (const file of result.filesWritten) {
+        console.log(`  - ${file}`);
+      }
+      console.log("");
+      console.log("Add to your tsconfig.json includes:");
+      console.log('  "include": ["src", "src/.flight/*.d.ts"]');
+    }
+  } catch (error) {
+    console.error("Type generation failed:", error);
+    process.exit(1);
+  }
+}
+
 // src/index.ts
 var cli = cac("flight");
 var LOGO = `
@@ -902,6 +1317,7 @@ cli.command("dev", "Start development server").option("-p, --port <port>", "Port
 cli.command("build", "Build for production").option("--outDir <dir>", "Output directory").option("--sourcemap", "Generate source maps").option("--minify", "Minify output", { default: true }).action(buildCommand);
 cli.command("preview", "Preview production build").option("-p, --port <port>", "Port to listen on").option("-h, --host <host>", "Host to bind to").option("--open", "Open browser on start").action(previewCommand);
 cli.command("routes:generate", "Generate route manifest from routes directory").option("--routesDir <dir>", "Routes directory", { default: "src/routes" }).option("--outputDir <dir>", "Output directory", { default: "src/.flight" }).action(routesGenerateCommand);
+cli.command("types:generate", "Generate TypeScript types for routes and environment").option("--routesDir <dir>", "Routes directory", { default: "src/routes" }).option("--outputDir <dir>", "Output directory", { default: "src/.flight" }).option("--routes", "Generate route types", { default: true }).option("--env", "Generate environment variable types").option("--watch", "Watch for changes and regenerate").action(typesGenerateCommand);
 function run() {
   try {
     cli.parse(process.argv, { run: false });