spfn 0.2.0-beta.1 → 0.2.0-beta.2

package/dist/index.js

@@ -1183,7 +1183,7 @@ import { existsSync as existsSync11, readFileSync as readFileSync3, writeFileSyn
 import { join as join11 } from "path";
 import { execa as execa4 } from "execa";
 import chokidar from "chokidar";
-var devCommand = new Command4("dev").description("Start SPFN development server (detects and runs Next.js + Hono)").option("-p, --port <port>", "Server port", "8790").option("-h, --host <host>", "Server host", "localhost").option("--routes <path>", "Routes directory path").option("--server-only", "Run only Hono server (skip Next.js)").option("--watch", "Enable hot reload (watch mode)").action(async (options) => {
+var devCommand = new Command4("dev").description("Start SPFN development server (detects and runs Next.js + Hono)").option("-p, --port <port>", "Server port").option("-H, --host <host>", "Server host").option("--routes <path>", "Routes directory path").option("--server-only", "Run only Hono server (skip Next.js)").option("--watch", "Enable hot reload (watch mode)").action(async (options) => {
   process.setMaxListeners(20);
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "development";
@@ -1205,6 +1205,11 @@ var devCommand = new Command4("dev").description("Start SPFN development server
   const serverEntry = join11(tempDir, "server.mjs");
   const watcherEntry = join11(tempDir, "watcher.mjs");
   mkdirSync(tempDir, { recursive: true });
+  const configParts = [];
+  if (options.port) configParts.push(`port: ${options.port}`);
+  if (options.host) configParts.push(`host: '${options.host}'`);
+  if (options.routes) configParts.push(`routesPath: '${options.routes}'`);
+  configParts.push("debug: true");
   writeFileSync6(serverEntry, `
 // Load environment variables FIRST (before any imports that depend on them)
 // Use centralized environment loader for standard dotenv priority
@@ -1214,9 +1219,7 @@ await import('@spfn/core/config');
 const { startServer } = await import('@spfn/core/server');
 
 await startServer({
-    port: ${options.port},
-    host: '${options.host}',
-    ${options.routes ? `routesPath: '${options.routes}',` : ""}debug: true
+    ${configParts.join(",\n    ")}
 });
 `);
   writeFileSync6(watcherEntry, `
@@ -1312,7 +1315,7 @@ catch (error)
           serverProcess2.kill("SIGTERM");
           await serverProcess2.catch(() => {
           });
-          await new Promise((resolve) => setTimeout(resolve, 500));
+          await new Promise((resolve2) => setTimeout(resolve2, 500));
         } catch (error) {
         }
       }
@@ -1356,12 +1359,12 @@ catch (error)
     process.on("SIGTERM", cleanup2);
     startWatcher2();
     startServer2();
-    await new Promise((resolve) => {
+    await new Promise((resolve2) => {
       const keepAlive = setInterval(() => {
       }, 1e6);
       process.once("beforeExit", () => {
         clearInterval(keepAlive);
-        resolve();
+        resolve2();
       });
     });
     return;
@@ -1421,7 +1424,7 @@ catch (error)
         serverProcess.kill("SIGTERM");
         await serverProcess.catch(() => {
         });
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        await new Promise((resolve2) => setTimeout(resolve2, 500));
       } catch (error) {
       }
     }
@@ -1468,14 +1471,14 @@ catch (error)
   process.on("SIGTERM", cleanup);
   startWatcher();
   startServer();
-  await new Promise((resolve) => setTimeout(resolve, 2e3));
+  await new Promise((resolve2) => setTimeout(resolve2, 2e3));
   startNext();
-  await new Promise((resolve) => {
+  await new Promise((resolve2) => {
     const keepAlive = setInterval(() => {
     }, 1e6);
     process.once("beforeExit", () => {
       clearInterval(keepAlive);
-      resolve();
+      resolve2();
     });
   });
 });
@@ -2024,7 +2027,7 @@ async function runDrizzleCommand(command) {
   }
   const args = command.split(" ");
   args.push(`--config=${configPath}`);
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const drizzleProcess = spawn("drizzle-kit", args, {
       stdio: "inherit",
       // Allow interactive input
@@ -2038,7 +2041,7 @@ async function runDrizzleCommand(command) {
     drizzleProcess.on("close", (code) => {
       cleanup();
       if (code === 0) {
-        resolve();
+        resolve2();
       } else {
         reject(new Error(`drizzle-kit ${command} exited with code ${code}`));
       }
@@ -2130,15 +2133,15 @@ function parseDatabaseUrl(dbUrl) {
   }
 }
 async function isPortAvailable(port) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const server = net.createServer();
     server.once("error", () => {
       server.close();
-      resolve(false);
+      resolve2(false);
     });
     server.once("listening", () => {
       server.close();
-      resolve(true);
+      resolve2(true);
     });
     server.listen(port, "127.0.0.1");
   });
@@ -2392,7 +2395,7 @@ async function dbBackup(options) {
   pgDump.stderr?.on("data", (data) => {
     errorOutput += data.toString();
   });
-  await new Promise((resolve, reject) => {
+  await new Promise((resolve2, reject) => {
     pgDump.on("close", async (code) => {
       if (code === 0) {
         try {
@@ -2429,7 +2432,7 @@ async function dbBackup(options) {
             tags: tags.length > 0 ? tags : void 0
           };
           await saveBackupMetadata(metadata, filename);
-          resolve();
+          resolve2();
         } catch (error) {
           reject(error);
         }
@@ -2761,12 +2764,12 @@ async function dbRestore(backupFile, options = {}) {
   restoreProcess.stderr?.on("data", (data) => {
     errorOutput += data.toString();
   });
-  await new Promise((resolve, reject) => {
+  await new Promise((resolve2, reject) => {
     restoreProcess.on("close", (code) => {
       if (code === 0) {
         spinner.succeed("Restore completed");
         console.log(chalk20.green("\n\u2705 Database restored successfully"));
-        resolve();
+        resolve2();
       } else {
         spinner.fail("Restore failed");
         reject(new Error(errorOutput || "Restore failed"));
@@ -4285,6 +4288,20 @@ generateCommand.command("fn").description("Generate a new SPFN function module")
 // src/commands/env.ts
 import { Command as Command12 } from "commander";
 import chalk26 from "chalk";
+import { existsSync as existsSync23, readFileSync as readFileSync8, writeFileSync as writeFileSync18 } from "fs";
+import { resolve } from "path";
+import { parse } from "dotenv";
+var ENV_FILES = {
+  nextjs: [".env", ".env.local"],
+  server: [".env.server", ".env.server.local"]
+};
+function getTargetFile(schema) {
+  const isNextjs = schema.nextjs ?? schema.key?.startsWith("NEXT_PUBLIC_");
+  if (isNextjs) {
+    return schema.sensitive ? ".env.local" : ".env";
+  }
+  return schema.sensitive ? ".env.server.local" : ".env.server";
+}
 async function loadEnvSchema(packageName) {
   try {
     const schemaPath = `${packageName}/config`;
@@ -4329,26 +4346,34 @@ async function listEnvVars(options) {
   const packageName = options.package || "@spfn/core";
   try {
     const envSchema = await loadEnvSchema(packageName);
-    console.log(chalk26.blue.bold(`
-\u{1F4CB} Environment Variables (${packageName})
-`));
     const allVars = Object.entries(envSchema);
-    for (const [key, schema] of allVars) {
-      const typeStr = formatType(schema.type);
-      const requiredStr = schema.required || schema.default !== void 0 ? chalk26.red("[required]") : chalk26.dim("[optional]");
-      const sensitiveStr = schema.sensitive ? chalk26.yellow(" [sensitive]") : "";
-      console.log(`${chalk26.bold.cyan(key)} ${chalk26.dim("(")}${typeStr}${chalk26.dim(")")} ${requiredStr}${sensitiveStr}`);
-      console.log(`  ${chalk26.dim(schema.description)}`);
-      if (schema.default !== void 0) {
-        console.log(`  ${chalk26.dim("Default:")} ${formatDefault(schema.default, schema.type)}`);
+    if (options.group) {
+      const grouped = allVars.reduce((acc, [key, schema]) => {
+        const target = getTargetFile(schema);
+        if (!acc[target]) acc[target] = [];
+        acc[target].push([key, schema]);
+        return acc;
+      }, {});
+      console.log(chalk26.blue.bold(`
+\u{1F4CB} Environment Variables by File (${packageName})
+`));
+      for (const [file, vars] of Object.entries(grouped)) {
+        console.log(chalk26.bold.magenta(`
+${file}`));
+        console.log(chalk26.dim("\u2500".repeat(50)));
+        for (const [key, schema] of vars) {
+          printEnvVar(key, schema);
+        }
       }
-      if (schema.examples && schema.examples.length > 0) {
-        const exampleStr = schema.examples.map((ex) => formatDefault(ex, schema.type)).join(", ");
-        console.log(`  ${chalk26.dim("Examples:")} ${exampleStr}`);
+    } else {
+      console.log(chalk26.blue.bold(`
+\u{1F4CB} Environment Variables (${packageName})
+`));
+      for (const [key, schema] of allVars) {
+        printEnvVar(key, schema, true);
       }
-      console.log();
     }
-    console.log(chalk26.dim("\n\u{1F4A1} Tip: Use these variable names in your .env files\n"));
+    console.log(chalk26.dim("\n\u{1F4A1} Tip: Use `spfn env init` to generate .env template files\n"));
   } catch (error) {
     console.error(chalk26.red(`
 \u274C ${error instanceof Error ? error.message : "Unknown error"}
@@ -4356,6 +4381,22 @@ async function listEnvVars(options) {
     process.exit(1);
   }
 }
+function printEnvVar(key, schema, showFile = false) {
+  const typeStr = formatType(schema.type);
+  const requiredStr = schema.required || schema.default !== void 0 ? chalk26.red("[required]") : chalk26.dim("[optional]");
+  const sensitiveStr = schema.sensitive ? chalk26.yellow(" [sensitive]") : "";
+  const fileStr = showFile ? chalk26.dim(` \u2192 ${getTargetFile(schema)}`) : "";
+  console.log(`${chalk26.bold.cyan(key)} ${chalk26.dim("(")}${typeStr}${chalk26.dim(")")} ${requiredStr}${sensitiveStr}${fileStr}`);
+  console.log(`  ${chalk26.dim(schema.description)}`);
+  if (schema.default !== void 0) {
+    console.log(`  ${chalk26.dim("Default:")} ${formatDefault(schema.default, schema.type)}`);
+  }
+  if (schema.examples && schema.examples.length > 0) {
+    const exampleStr = schema.examples.map((ex) => formatDefault(ex, schema.type)).join(", ");
+    console.log(`  ${chalk26.dim("Examples:")} ${exampleStr}`);
+  }
+  console.log();
+}
 async function showEnvStats(options) {
   const packageName = options.package || "@spfn/core";
   try {
@@ -4367,14 +4408,32 @@ async function showEnvStats(options) {
     const required = allVars.filter(([_, schema]) => schema.required || schema.default !== void 0);
     const optional = allVars.filter(([_, schema]) => !schema.required && schema.default === void 0);
     const sensitive = allVars.filter(([_, schema]) => schema.sensitive);
+    const nextjsVars = allVars.filter(
+      ([_, schema]) => schema.nextjs ?? schema.key?.startsWith("NEXT_PUBLIC_")
+    );
+    const serverOnlyVars = allVars.filter(
+      ([_, schema]) => !(schema.nextjs ?? schema.key?.startsWith("NEXT_PUBLIC_"))
+    );
     const typeCount = allVars.reduce((acc, [_, schema]) => {
       acc[schema.type] = (acc[schema.type] || 0) + 1;
       return acc;
     }, {});
+    const fileCount = allVars.reduce((acc, [_, schema]) => {
+      const file = getTargetFile(schema);
+      acc[file] = (acc[file] || 0) + 1;
+      return acc;
+    }, {});
     console.log(`${chalk26.bold("Total variables:")} ${chalk26.cyan(allVars.length)}`);
     console.log(`${chalk26.bold("Required:")} ${chalk26.red(required.length)}`);
     console.log(`${chalk26.bold("Optional:")} ${chalk26.dim(optional.length)}`);
     console.log(`${chalk26.bold("Sensitive:")} ${chalk26.yellow(sensitive.length)}`);
+    console.log(chalk26.bold("\nBy Target:"));
+    console.log(`  ${chalk26.blue("Next.js accessible:")} ${chalk26.cyan(nextjsVars.length)}`);
+    console.log(`  ${chalk26.magenta("SPFN server only:")} ${chalk26.cyan(serverOnlyVars.length)}`);
+    console.log(chalk26.bold("\nBy File:"));
+    for (const [file, count] of Object.entries(fileCount)) {
+      console.log(`  ${chalk26.dim(file)}: ${chalk26.cyan(count)}`);
+    }
     console.log(chalk26.bold("\nBy Type:"));
     for (const [type, count] of Object.entries(typeCount)) {
       console.log(`  ${formatType(type)}: ${chalk26.cyan(count)}`);
@@ -4427,9 +4486,160 @@ async function searchEnvVars(query, options) {
   }
 }
 var envCommand = new Command12("env").description("Manage environment variables");
-envCommand.command("list").description("List all environment variables from schema").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").action(listEnvVars);
+envCommand.command("list").description("List all environment variables from schema").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").option("-g, --group", "Group variables by target file").action(listEnvVars);
 envCommand.command("stats").description("Show environment variable statistics").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").action(showEnvStats);
 envCommand.command("search").description("Search environment variables").argument("<query>", "Search query (matches key or description)").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").action(searchEnvVars);
+async function initEnvFiles(options) {
+  const packageName = options.package || "@spfn/core";
+  const cwd = process.cwd();
+  try {
+    const envSchema = await loadEnvSchema(packageName);
+    const allVars = Object.entries(envSchema);
+    const grouped = allVars.reduce((acc, [key, schema]) => {
+      const target = getTargetFile(schema);
+      const exampleFile = target + ".example";
+      if (!acc[exampleFile]) acc[exampleFile] = [];
+      acc[exampleFile].push([key, schema]);
+      return acc;
+    }, {});
+    console.log(chalk26.blue.bold(`
+\u{1F680} Generating .env template files
+`));
+    for (const [file, vars] of Object.entries(grouped)) {
+      const filePath = resolve(cwd, file);
+      if (existsSync23(filePath) && !options.force) {
+        console.log(chalk26.yellow(`  \u23ED\uFE0F  ${file} already exists (use --force to overwrite)`));
+        continue;
+      }
+      const content = generateEnvFileContent(vars);
+      writeFileSync18(filePath, content, "utf-8");
+      console.log(chalk26.green(`  \u2705 ${file} (${vars.length} variables)`));
+    }
+    console.log(chalk26.dim("\n\u{1F4A1} Copy .example files to create your actual .env files:"));
+    console.log(chalk26.dim("   cp .env.example .env"));
+    console.log(chalk26.dim("   cp .env.local.example .env.local"));
+    console.log(chalk26.dim("   cp .env.server.example .env.server"));
+    console.log(chalk26.dim("   cp .env.server.local.example .env.server.local\n"));
+  } catch (error) {
+    console.error(chalk26.red(`
+\u274C ${error instanceof Error ? error.message : "Unknown error"}
+`));
+    process.exit(1);
+  }
+}
+function generateEnvFileContent(vars) {
+  const lines = [
+    "# Auto-generated by spfn env init",
+    "# Copy this file and fill in the values",
+    ""
+  ];
+  for (const [key, schema] of vars) {
+    lines.push(`# ${schema.description}`);
+    if (schema.required) {
+      lines.push(`# [required]`);
+    }
+    if (schema.sensitive) {
+      lines.push(`# [sensitive] - Do not commit this value!`);
+    }
+    let value = "";
+    if (schema.default !== void 0) {
+      value = String(schema.default);
+    } else if (schema.examples && schema.examples.length > 0) {
+      value = String(schema.examples[0]);
+    }
+    lines.push(`${key}=${value}`);
+    lines.push("");
+  }
+  return lines.join("\n");
+}
+async function checkEnvFiles(options) {
+  const packageName = options.package || "@spfn/core";
+  const cwd = process.cwd();
+  try {
+    const envSchema = await loadEnvSchema(packageName);
+    const allVars = Object.entries(envSchema);
+    console.log(chalk26.blue.bold(`
+\u{1F50D} Checking .env files against schema
+`));
+    const allFiles = [...ENV_FILES.nextjs, ...ENV_FILES.server];
+    const loadedEnv = {};
+    const issues = [];
+    const warnings = [];
+    for (const file of allFiles) {
+      const filePath = resolve(cwd, file);
+      if (!existsSync23(filePath)) {
+        continue;
+      }
+      const content = readFileSync8(filePath, "utf-8");
+      const parsed = parse(content);
+      for (const [key, value] of Object.entries(parsed)) {
+        loadedEnv[key] = { value: value || "", file };
+      }
+      console.log(chalk26.dim(`  \u{1F4C4} ${file} loaded`));
+    }
+    console.log("");
+    for (const [key, schema] of allVars) {
+      const expectedFile = getTargetFile(schema);
+      const found = loadedEnv[key];
+      if (!found) {
+        if (schema.required && schema.default === void 0) {
+          issues.push(`${chalk26.red("\u2717")} ${chalk26.cyan(key)} is required but not found in any .env file`);
+        }
+        continue;
+      }
+      const isNextjsFile = ENV_FILES.nextjs.includes(found.file);
+      const isServerFile = ENV_FILES.server.includes(found.file);
+      const shouldBeNextjs = schema.nextjs ?? key.startsWith("NEXT_PUBLIC_");
+      if (!shouldBeNextjs && isNextjsFile && !isServerFile) {
+        if (schema.sensitive) {
+          issues.push(
+            `${chalk26.red("\u2717")} ${chalk26.cyan(key)} is sensitive and should be in ${chalk26.magenta(expectedFile)}, but found in ${chalk26.yellow(found.file)} (security risk!)`
+          );
+        } else {
+          warnings.push(
+            `${chalk26.yellow("\u26A0")} ${chalk26.cyan(key)} should be in ${chalk26.magenta(expectedFile)}, but found in ${chalk26.dim(found.file)}`
+          );
+        }
+      }
+    }
+    for (const [key, { file }] of Object.entries(loadedEnv)) {
+      const inSchema = allVars.some(([k]) => k === key);
+      if (!inSchema) {
+        warnings.push(`${chalk26.yellow("\u26A0")} ${chalk26.cyan(key)} in ${chalk26.dim(file)} is not in schema`);
+      }
+    }
+    if (issues.length > 0) {
+      console.log(chalk26.red.bold("Issues:"));
+      for (const issue of issues) {
+        console.log(`  ${issue}`);
+      }
+      console.log("");
+    }
+    if (warnings.length > 0) {
+      console.log(chalk26.yellow.bold("Warnings:"));
+      for (const warning of warnings) {
+        console.log(`  ${warning}`);
+      }
+      console.log("");
+    }
+    if (issues.length === 0 && warnings.length === 0) {
+      console.log(chalk26.green("\u2705 All environment variables are correctly configured!\n"));
+    } else {
+      console.log(chalk26.dim(`Found ${issues.length} issue(s) and ${warnings.length} warning(s)
+`));
+      if (issues.length > 0) {
+        process.exit(1);
+      }
+    }
+  } catch (error) {
+    console.error(chalk26.red(`
+\u274C ${error instanceof Error ? error.message : "Unknown error"}
+`));
+    process.exit(1);
+  }
+}
+envCommand.command("init").description("Generate .env template files from schema").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").option("-f, --force", "Overwrite existing files").action(initEnvFiles);
+envCommand.command("check").description("Check .env files against schema").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").action(checkEnvFiles);
 
 // src/index.ts
 var program = new Command13();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
@@ -58,6 +58,7 @@
     "chalk": "^5.6.2",
     "chokidar": "^4.0.3",
     "commander": "^11.1.0",
+    "dotenv": "^17.2.3",
     "drizzle-orm": "^0.44.7",
     "execa": "^8.0.1",
     "fs-extra": "^11.2.0",
@@ -66,7 +67,7 @@
     "postgres": "^3.4.0",
     "prompts": "^2.4.2",
     "tsup": "^8.5.0",
-    "@spfn/core": "0.2.0-beta.1"
+    "@spfn/core": "0.2.0-beta.4"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
@@ -74,7 +75,6 @@
     "@types/pg": "^8.10.9",
     "@types/prompts": "^2.4.9",
     "concurrently": "^9.2.1",
-    "dotenv": "^17.2.3",
     "drizzle-kit": "^0.31.6",
     "tsx": "^4.20.6",
     "typescript": "^5.3.3"