spfn 0.2.0-beta.10 → 0.2.0-beta.11

package/dist/index.js

@@ -755,7 +755,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.2.0-beta.10";
+  return "0.2.0-beta.11";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);
@@ -833,26 +833,7 @@ import { existsSync as existsSync9, readFileSync as readFileSync2 } from "fs";
 import { join as join9 } from "path";
 import fse7 from "fs-extra";
 async function setupConfigFiles(cwd) {
-  const envExamplePath = join9(cwd, ".env.local.example");
-  if (!existsSync9(envExamplePath)) {
-    const envExampleContent = `# Environment
-NODE_ENV=local
-
-# Logging
-SPFN_LOG_LEVEL=info
-
-# Database (matches docker-compose.yml)
-DATABASE_URL=postgresql://spfn:spfn@localhost:5432/spfn_dev
-
-# Cache - Redis/Valkey (optional)
-CACHE_URL=redis://localhost:6379
-
-# SPFN API Server URL (for API Route Proxy and SSR)
-SPFN_API_URL=http://localhost:8790
-`;
-    writeFileSync5(envExamplePath, envExampleContent);
-    logger.success("Created .env.local.example");
-  }
+  generateEnvExamples(cwd);
   const spfnrcPath = join9(cwd, ".spfnrc.ts");
   if (!existsSync9(spfnrcPath)) {
     const spfnrcContent = `import { defineConfig, defineGenerator } from '@spfn/core/codegen';
@@ -878,38 +859,118 @@ export default defineConfig({
     writeFileSync5(spfnrcPath, spfnrcContent);
     logger.success("Created .spfnrc.ts (codegen configuration)");
   }
+  updateGitignore(cwd);
+  updateTsconfig(cwd);
+}
+function generateEnvExamples(cwd) {
+  writeEnvExample(cwd, ".env.example", `# Shared defaults (committed)
+# These values are shared across all environments.
+
+# Environment
+NODE_ENV=local
+
+# Logging
+SPFN_LOG_LEVEL=info
+
+# Server
+PORT=4000
+
+# SPFN API Server URL (for API Route Proxy and SSR)
+SPFN_API_URL=http://localhost:8790
+NEXT_PUBLIC_SPFN_API_URL=http://localhost:8790
+`);
+  writeEnvExample(cwd, ".env.local.example", `# Local overrides (gitignored)
+# Developer-specific values that should NOT be committed.
+
+# Database (matches docker-compose.yml)
+DATABASE_URL=postgresql://spfn:spfn@localhost:5432/spfn_dev
+
+# Cache - Redis/Valkey (optional)
+CACHE_URL=redis://localhost:6379
+
+# SPFN App URL (optional, for CORS and redirects)
+# SPFN_APP_URL=http://localhost:3790
+`);
+  writeEnvExample(cwd, ".env.server.example", `# Server-only defaults (committed)
+# These values are only loaded by the SPFN server, not by Next.js.
+
+# Database pool
+DB_POOL_MAX=10
+DB_POOL_IDLE_TIMEOUT=30
+
+# Server timeouts
+SERVER_TIMEOUT=120000
+SHUTDOWN_TIMEOUT=30000
+`);
+  writeEnvExample(cwd, ".env.server.local.example", `# Server secrets (gitignored)
+# Server-only sensitive values. Never commit this file.
+
+# Database write/read URLs (master-replica pattern, optional)
+# DATABASE_WRITE_URL=postgresql://user:password@master:5432/dbname
+# DATABASE_READ_URL=postgresql://user:password@replica:5432/dbname
+
+# Cache password (optional)
+# CACHE_PASSWORD=your-redis-password
+`);
+}
+function writeEnvExample(cwd, filename, content) {
+  const filePath = join9(cwd, filename);
+  if (existsSync9(filePath)) {
+    return;
+  }
+  writeFileSync5(filePath, content);
+  logger.success(`Created ${filename}`);
+}
+function updateGitignore(cwd) {
   const gitignorePath = join9(cwd, ".gitignore");
-  if (existsSync9(gitignorePath)) {
-    try {
-      const gitignoreContent = readFileSync2(gitignorePath, "utf-8");
-      if (!gitignoreContent.includes(".spfn")) {
-        const updatedContent = gitignoreContent.replace(
-          /# production\n\/build/,
-          "# production\n/build\n\n# spfn\n/.spfn/"
-        );
-        writeFileSync5(gitignorePath, updatedContent);
-        logger.success("Updated .gitignore with .spfn directory");
-      }
-    } catch (error) {
-      logger.warn("Could not update .gitignore (you can add .spfn manually)");
+  if (!existsSync9(gitignorePath)) {
+    return;
+  }
+  try {
+    const content = readFileSync2(gitignorePath, "utf-8");
+    let updated = content;
+    let changed = false;
+    if (!content.includes(".spfn")) {
+      updated = updated.replace(
+        /# production\n\/build/,
+        "# production\n/build\n\n# spfn\n/.spfn/"
+      );
+      changed = true;
     }
+    if (!content.includes(".env.local") && !content.includes(".env.*.local")) {
+      updated += `
+# environment secrets (local overrides)
+.env.local
+.env.*.local
+`;
+      changed = true;
+    }
+    if (changed) {
+      writeFileSync5(gitignorePath, updated);
+      logger.success("Updated .gitignore with .spfn directory and env patterns");
+    }
+  } catch (error) {
+    logger.warn("Could not update .gitignore (you can add patterns manually)");
   }
+}
+function updateTsconfig(cwd) {
   const tsconfigPath = join9(cwd, "tsconfig.json");
-  if (existsSync9(tsconfigPath)) {
-    try {
-      const tsconfigContent = readFileSync2(tsconfigPath, "utf-8");
-      const tsconfig = JSON.parse(tsconfigContent);
-      if (!tsconfig.exclude) {
-        tsconfig.exclude = [];
-      }
-      if (!tsconfig.exclude.includes("src/server")) {
-        tsconfig.exclude.push("src/server");
-        writeFileSync5(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
-        logger.success("Updated tsconfig.json (excluded src/server for Vercel compatibility)");
-      }
-    } catch (error) {
-      logger.warn('Could not update tsconfig.json (you can add "src/server" to exclude manually)');
+  if (!existsSync9(tsconfigPath)) {
+    return;
+  }
+  try {
+    const tsconfigContent = readFileSync2(tsconfigPath, "utf-8");
+    const tsconfig = JSON.parse(tsconfigContent);
+    if (!tsconfig.exclude) {
+      tsconfig.exclude = [];
+    }
+    if (!tsconfig.exclude.includes("src/server")) {
+      tsconfig.exclude.push("src/server");
+      writeFileSync5(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
+      logger.success("Updated tsconfig.json (excluded src/server for Vercel compatibility)");
     }
+  } catch (error) {
+    logger.warn('Could not update tsconfig.json (you can add "src/server" to exclude manually)');
   }
 }
 var writeFileSync5;
@@ -983,7 +1044,7 @@ __export(function_migrations_exports, {
 import chalk11 from "chalk";
 import { join as join15 } from "path";
 import { env as env2 } from "@spfn/core/config";
-import { loadEnvFiles as loadEnvFiles2 } from "@spfn/core/server";
+import { loadEnv as loadEnv2 } from "@spfn/core/server";
 import { existsSync as existsSync16, readdirSync as readdirSync2, readFileSync as readFileSync5 } from "fs";
 function discoverFunctionMigrations(cwd = process.cwd()) {
   const nodeModulesPath = join15(cwd, "node_modules");
@@ -1031,7 +1092,7 @@ async function executeFunctionMigrations(functionMigrations) {
   const { drizzle } = await import("drizzle-orm/postgres-js");
   const { migrate } = await import("drizzle-orm/postgres-js/migrator");
   const postgres = await import("postgres");
-  loadEnvFiles2();
+  loadEnv2();
   if (!env2.DATABASE_URL) {
     throw new Error("DATABASE_URL not found in environment");
   }
@@ -2020,9 +2081,9 @@ import { spawn } from "child_process";
 import chalk9 from "chalk";
 import ora6 from "ora";
 import { env } from "@spfn/core/config";
-import { loadEnvFiles } from "@spfn/core/server";
+import { loadEnv } from "@spfn/core/server";
 function validateDatabasePrerequisites() {
-  loadEnvFiles();
+  loadEnv();
   if (!env.DATABASE_URL) {
     console.error(chalk9.red("\u274C DATABASE_URL not found in environment"));
     console.log(chalk9.yellow("\n\u{1F4A1} Tip: Add DATABASE_URL to your .env file"));
@@ -2034,7 +2095,7 @@ async function runDrizzleCommand(command) {
   const tempConfigPath = `./drizzle.config.${process.pid}.${Date.now()}.temp.ts`;
   const configPath = hasUserConfig ? "./drizzle.config.ts" : tempConfigPath;
   if (!hasUserConfig) {
-    loadEnvFiles();
+    loadEnv();
     if (!env.DATABASE_URL) {
       console.error(chalk9.red("\u274C DATABASE_URL not found in environment"));
       console.log(chalk9.yellow("\n\u{1F4A1} Tip: Add DATABASE_URL to your .env file"));
@@ -2368,10 +2429,10 @@ async function listBackupFiles() {
 
 // src/commands/db/backup.ts
 import { env as env3 } from "@spfn/core/config";
-import { loadEnvFiles as loadEnvFiles3 } from "@spfn/core/server";
+import { loadEnv as loadEnv3 } from "@spfn/core/server";
 async function dbBackup(options) {
   console.log(chalk15.blue("\u{1F4BE} Creating database backup...\n"));
-  loadEnvFiles3();
+  loadEnv3();
   const dbUrl = env3.DATABASE_URL;
   if (!dbUrl) {
     console.error(chalk15.red("\u274C DATABASE_URL not found in environment"));
@@ -2656,10 +2717,10 @@ import chalk20 from "chalk";
 import ora9 from "ora";
 import prompts4 from "prompts";
 import { env as env5 } from "@spfn/core/config";
-import { loadEnvFiles as loadEnvFiles4 } from "@spfn/core/server";
+import { loadEnv as loadEnv4 } from "@spfn/core/server";
 async function dbRestore(backupFile, options = {}) {
   console.log(chalk20.blue("\u267B\uFE0F  Restoring database from backup...\n"));
-  loadEnvFiles4();
+  loadEnv4();
   const dbUrl = env5.DATABASE_URL;
   if (!dbUrl) {
     console.error(chalk20.red("\u274C DATABASE_URL not found in environment"));
@@ -4390,10 +4451,26 @@ 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 = {
+var VALID_ENVS = ["local", "development", "staging", "production", "test"];
+var BASE_ENV_FILES = {
   nextjs: [".env", ".env.local"],
   server: [".env.server", ".env.server.local"]
 };
+function getEnvFilesForEnvironment(nodeEnv) {
+  const files = [".env"];
+  if (nodeEnv) {
+    files.push(`.env.${nodeEnv}`);
+  }
+  if (nodeEnv !== "test") {
+    files.push(".env.local");
+  }
+  if (nodeEnv) {
+    files.push(`.env.${nodeEnv}.local`);
+  }
+  files.push(".env.server");
+  files.push(".env.server.local");
+  return files;
+}
 function getTargetFile(schema) {
   const isNextjs = schema.nextjs ?? schema.key?.startsWith("NEXT_PUBLIC_");
   if (isNextjs) {
@@ -4426,8 +4503,7 @@ function formatType(type) {
     enum: chalk26.magenta,
     json: chalk26.red
   };
-  const colorFn = typeColors[type] || chalk26.white;
-  return colorFn(type);
+  return (typeColors[type] || chalk26.white)(type);
 }
 function formatDefault(value, type) {
   if (value === void 0) {
@@ -4588,8 +4664,19 @@ 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").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);
+function validateEnvOption(envValue) {
+  if (!VALID_ENVS.includes(envValue)) {
+    console.error(chalk26.red(`
+\u274C Invalid environment: "${envValue}"`));
+    console.log(chalk26.dim(`   Valid values: ${VALID_ENVS.join(", ")}
+`));
+    process.exit(1);
+  }
+  return envValue;
+}
 async function initEnvFiles(options) {
   const packageName = options.package || "@spfn/core";
+  const targetEnv = options.env ? validateEnvOption(options.env) : void 0;
   const cwd = process.cwd();
   try {
     const envSchema = await loadEnvSchema(packageName);
@@ -4601,24 +4688,41 @@ async function initEnvFiles(options) {
       acc[exampleFile].push([key, schema]);
       return acc;
     }, {});
-    console.log(chalk26.blue.bold(`
+    if (targetEnv) {
+      console.log(chalk26.blue.bold(`
+\u{1F680} Generating .env template files for ${chalk26.cyan(targetEnv)} environment
+`));
+      const envSpecificFiles = {};
+      const committedVars = allVars.filter(([_, schema]) => !schema.sensitive);
+      if (committedVars.length > 0) {
+        envSpecificFiles[`.env.${targetEnv}.example`] = committedVars;
+      }
+      const sensitiveVars = allVars.filter(([_, schema]) => schema.sensitive);
+      if (sensitiveVars.length > 0) {
+        envSpecificFiles[`.env.${targetEnv}.local.example`] = sensitiveVars;
+      }
+      const allGrouped = { ...grouped, ...envSpecificFiles };
+      for (const [file, vars] of Object.entries(allGrouped)) {
+        writeEnvTemplate(cwd, file, vars, options.force ?? false);
+      }
+    } else {
+      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;
+      for (const [file, vars] of Object.entries(grouped)) {
+        writeEnvTemplate(cwd, file, vars, options.force ?? false);
       }
-      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"));
+    console.log(chalk26.dim("   cp .env.server.local.example .env.server.local"));
+    if (targetEnv) {
+      console.log(chalk26.dim(`   cp .env.${targetEnv}.example .env.${targetEnv}`));
+      console.log(chalk26.dim(`   cp .env.${targetEnv}.local.example .env.${targetEnv}.local`));
+    }
+    console.log("");
   } catch (error) {
     console.error(chalk26.red(`
 \u274C ${error instanceof Error ? error.message : "Unknown error"}
@@ -4626,6 +4730,15 @@ async function initEnvFiles(options) {
     process.exit(1);
   }
 }
+function writeEnvTemplate(cwd, file, vars, force) {
+  const filePath = resolve(cwd, file);
+  if (existsSync23(filePath) && !force) {
+    console.log(chalk26.yellow(`  \u23ED\uFE0F  ${file} already exists (use --force to overwrite)`));
+    return;
+  }
+  writeFileSync18(filePath, generateEnvFileContent(vars), "utf-8");
+  console.log(chalk26.green(`  \u2705 ${file} (${vars.length} variables)`));
+}
 function generateEnvFileContent(vars) {
   const lines = [
     "# Auto-generated by spfn env init",
@@ -4653,18 +4766,20 @@ function generateEnvFileContent(vars) {
 }
 async function checkEnvFiles(options) {
   const packageName = options.package || "@spfn/core";
+  const targetEnv = options.env ? validateEnvOption(options.env) : void 0;
   const cwd = process.cwd();
   try {
     const envSchema = await loadEnvSchema(packageName);
     const allVars = Object.entries(envSchema);
+    const envLabel = targetEnv ? ` (${targetEnv})` : "";
     console.log(chalk26.blue.bold(`
-\u{1F50D} Checking .env files against schema
+\u{1F50D} Checking .env files against schema${envLabel}
 `));
-    const allFiles = [...ENV_FILES.nextjs, ...ENV_FILES.server];
+    const filesToCheck = targetEnv ? getEnvFilesForEnvironment(targetEnv) : [...BASE_ENV_FILES.nextjs, ...BASE_ENV_FILES.server];
     const loadedEnv = {};
     const issues = [];
     const warnings = [];
-    for (const file of allFiles) {
+    for (const file of filesToCheck) {
       const filePath = resolve(cwd, file);
       if (!existsSync23(filePath)) {
         continue;
@@ -4686,8 +4801,8 @@ async function checkEnvFiles(options) {
         }
         continue;
       }
-      const isNextjsFile = ENV_FILES.nextjs.includes(found.file);
-      const isServerFile = ENV_FILES.server.includes(found.file);
+      const isNextjsFile = BASE_ENV_FILES.nextjs.includes(found.file);
+      const isServerFile = BASE_ENV_FILES.server.includes(found.file);
       const shouldBeNextjs = schema.nextjs ?? key.startsWith("NEXT_PUBLIC_");
       if (!shouldBeNextjs && isNextjsFile && !isServerFile) {
         if (schema.sensitive) {
@@ -4737,13 +4852,26 @@ async function checkEnvFiles(options) {
     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);
+envCommand.command("init").description("Generate .env template files from schema").option("-p, --package <package>", "Package name to read env schema from", "@spfn/core").option("-e, --env <environment>", "Generate environment-specific templates (e.g. production, staging)").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").option("-e, --env <environment>", "Check files for a specific environment (e.g. production)").action(checkEnvFiles);
 async function validateEnvVars(options) {
   const packages = options.packages || ["@spfn/core"];
-  console.log(chalk26.blue.bold(`
+  const targetEnv = options.env ? validateEnvOption(options.env) : void 0;
+  if (targetEnv) {
+    const { loadEnv: loadEnv5 } = await import("@spfn/core/env/loader");
+    const result = loadEnv5({ nodeEnv: targetEnv });
+    console.log(chalk26.blue.bold(`
+\u{1F50D} Validating environment variables for ${chalk26.cyan(targetEnv)}
+`));
+    if (result.loadedFiles.length > 0) {
+      console.log(chalk26.dim(`  Loaded: ${result.loadedFiles.join(", ")}`));
+    }
+    console.log("");
+  } else {
+    console.log(chalk26.blue.bold(`
 \u{1F50D} Validating environment variables
 `));
+  }
   const allErrors = [];
   const allWarnings = [];
   for (const packageName of packages) {
@@ -4803,7 +4931,7 @@ async function validateEnvVars(options) {
     process.exit(1);
   }
 }
-envCommand.command("validate").description("Validate environment variables against schema (for CI/CD)").option("-p, --packages <packages...>", "Packages to validate", ["@spfn/core"]).option("-s, --strict", "Exit on any error (including load failures)").action(validateEnvVars);
+envCommand.command("validate").description("Validate environment variables against schema (for CI/CD)").option("-p, --packages <packages...>", "Packages to validate", ["@spfn/core"]).option("-e, --env <environment>", "Load env files for specific environment before validating").option("-s, --strict", "Exit on any error (including load failures)").action(validateEnvVars);
 
 // src/index.ts
 init_version();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.10",
+  "version": "0.2.0-beta.11",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
@@ -67,7 +67,7 @@
     "postgres": "^3.4.0",
     "prompts": "^2.4.2",
     "tsup": "^8.5.0",
-    "@spfn/core": "0.2.0-beta.13"
+    "@spfn/core": "0.2.0-beta.14"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",