@actuallyjamez/elysian 0.2.1 → 0.4.0

package/dist/cli/commands/init/terraform.js

@@ -0,0 +1,309 @@
+/**
+ * Smart Terraform file handling - append missing blocks
+ */
+/**
+ * Check if content has AWS provider configured
+ */
+export function hasAwsProvider(content) {
+    return /source\s*=\s*["']hashicorp\/aws["']/.test(content);
+}
+/**
+ * Check if a variable exists in the content
+ */
+export function hasVariable(content, name) {
+    const regex = new RegExp(`variable\\s+["']${name}["']`, "i");
+    return regex.test(content);
+}
+/**
+ * Check if a resource of a given type exists
+ */
+export function hasResource(content, type) {
+    const regex = new RegExp(`resource\\s+["']${type}["']`, "i");
+    return regex.test(content);
+}
+/**
+ * Check if an output exists in the content
+ */
+export function hasOutput(content, name) {
+    const regex = new RegExp(`output\\s+["']${name}["']`, "i");
+    return regex.test(content);
+}
+/**
+ * Providers template
+ */
+const PROVIDERS_BLOCK = `
+# Elysian: AWS Provider Configuration
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 6.0"
+    }
+  }
+}
+
+provider "aws" {
+  region = var.region
+}
+`;
+/**
+ * Smart append to providers.tf - only add if AWS provider is missing
+ */
+export function appendProviders(existing) {
+    if (hasAwsProvider(existing)) {
+        return existing; // Already has AWS provider
+    }
+    return existing + "\n" + PROVIDERS_BLOCK;
+}
+/**
+ * Get missing variables and return the block to append
+ */
+export function getMissingVariables(existing, apiName) {
+    const variables = {
+        region: `
+variable "region" {
+  type    = string
+  default = "eu-west-2"
+}`,
+        lambda_names: `
+variable "lambda_names" {
+  type    = list(string)
+  default = []
+}`,
+        api_routes: `
+variable "api_routes" {
+  type = map(object({
+    lambda_key      = string
+    route_key       = string
+    path_parameters = list(string)
+  }))
+  default = {}
+}`,
+        lambda_runtime: `
+variable "lambda_runtime" {
+  type    = string
+  default = "nodejs22.x"
+}`,
+        lambda_memory_size: `
+variable "lambda_memory_size" {
+  type    = number
+  default = 256
+}`,
+        lambda_timeout: `
+variable "lambda_timeout" {
+  type    = number
+  default = 30
+}`,
+        api_name: `
+variable "api_name" {
+  type    = string
+  default = "${apiName}"
+}`,
+        tags: `
+variable "tags" {
+  type    = map(string)
+  default = {}
+}`,
+    };
+    const missing = [];
+    for (const [name, block] of Object.entries(variables)) {
+        if (!hasVariable(existing, name)) {
+            missing.push(block);
+        }
+    }
+    if (missing.length === 0) {
+        return existing;
+    }
+    return existing + "\n# Elysian: Required Variables" + missing.join("");
+}
+/**
+ * Main resources template
+ */
+const MAIN_RESOURCES = `
+# Elysian: Lambda and API Gateway Resources
+
+locals {
+  lambda_functions = {
+    for name in var.lambda_names : name => {
+      filename         = "\${path.module}/../dist/\${name}.zip"
+      handler          = "index.handler"
+      source_code_hash = filebase64sha256("\${path.module}/../dist/\${name}.zip")
+    }
+  }
+}
+
+# API Gateway
+resource "aws_apigatewayv2_api" "elysian" {
+  name          = var.api_name
+  protocol_type = "HTTP"
+  tags          = var.tags
+}
+
+# IAM Role for Lambda
+resource "aws_iam_role" "elysian_lambda" {
+  name = "\${var.api_name}-lambda-role"
+
+  assume_role_policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [{
+      Action = "sts:AssumeRole"
+      Effect = "Allow"
+      Principal = {
+        Service = "lambda.amazonaws.com"
+      }
+    }]
+  })
+
+  tags = var.tags
+}
+
+resource "aws_iam_role_policy_attachment" "elysian_lambda_basic" {
+  role       = aws_iam_role.elysian_lambda.name
+  policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+}
+
+# Lambda Functions
+resource "aws_lambda_function" "elysian" {
+  for_each = local.lambda_functions
+
+  filename         = each.value.filename
+  function_name    = each.key
+  role             = aws_iam_role.elysian_lambda.arn
+  handler          = each.value.handler
+  source_code_hash = each.value.source_code_hash
+  runtime          = var.lambda_runtime
+  memory_size      = var.lambda_memory_size
+  timeout          = var.lambda_timeout
+
+  tags = var.tags
+}
+
+# API Gateway Integrations
+resource "aws_apigatewayv2_integration" "elysian" {
+  for_each = local.lambda_functions
+
+  api_id                 = aws_apigatewayv2_api.elysian.id
+  integration_type       = "AWS_PROXY"
+  integration_uri        = aws_lambda_function.elysian[each.key].invoke_arn
+  integration_method     = "POST"
+  payload_format_version = "2.0"
+}
+
+# Lambda Permissions
+resource "aws_lambda_permission" "elysian_apigateway" {
+  for_each = local.lambda_functions
+
+  statement_id  = "AllowAPIGateway"
+  action        = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.elysian[each.key].function_name
+  principal     = "apigateway.amazonaws.com"
+  source_arn    = "\${aws_apigatewayv2_api.elysian.execution_arn}/*/*"
+}
+
+# API Gateway Routes
+resource "aws_apigatewayv2_route" "elysian" {
+  for_each = var.api_routes
+
+  api_id    = aws_apigatewayv2_api.elysian.id
+  route_key = each.value.route_key
+  target    = "integrations/\${aws_apigatewayv2_integration.elysian[each.value.lambda_key].id}"
+}
+
+# API Gateway Stage
+resource "aws_apigatewayv2_stage" "elysian" {
+  api_id      = aws_apigatewayv2_api.elysian.id
+  name        = "$default"
+  auto_deploy = true
+  tags        = var.tags
+}
+`;
+/**
+ * Smart append to main.tf - only add if API Gateway resource is missing
+ */
+export function appendMain(existing) {
+    // Check for our specific resource or any API Gateway
+    if (hasResource(existing, "aws_apigatewayv2_api") ||
+        hasResource(existing, "aws_lambda_function")) {
+        return existing; // Already has Lambda/API Gateway resources
+    }
+    return existing + MAIN_RESOURCES;
+}
+/**
+ * Outputs template
+ */
+const OUTPUTS_BLOCK = `
+# Elysian: API Endpoint Output
+output "api_endpoint" {
+  description = "API Gateway endpoint URL"
+  value       = aws_apigatewayv2_stage.elysian.invoke_url
+}
+`;
+/**
+ * Smart append to outputs.tf - only add if api_endpoint output is missing
+ */
+export function appendOutputs(existing) {
+    if (hasOutput(existing, "api_endpoint")) {
+        return existing;
+    }
+    return existing + OUTPUTS_BLOCK;
+}
+/**
+ * Full templates for new files
+ */
+export const templates = {
+    providers: PROVIDERS_BLOCK.trim() + "\n",
+    variables: (apiName) => `# Elysian: Terraform Variables
+
+variable "region" {
+  type    = string
+  default = "eu-west-2"
+}
+
+variable "lambda_names" {
+  type    = list(string)
+  default = []
+}
+
+variable "api_routes" {
+  type = map(object({
+    lambda_key      = string
+    route_key       = string
+    path_parameters = list(string)
+  }))
+  default = {}
+}
+
+variable "lambda_runtime" {
+  type    = string
+  default = "nodejs22.x"
+}
+
+variable "lambda_memory_size" {
+  type    = number
+  default = 256
+}
+
+variable "lambda_timeout" {
+  type    = number
+  default = 30
+}
+
+variable "api_name" {
+  type    = string
+  default = "${apiName}"
+}
+
+variable "tags" {
+  type    = map(string)
+  default = {}
+}
+`,
+    main: MAIN_RESOURCES.trim() + "\n",
+    outputs: `# Elysian: Outputs
+
+output "api_endpoint" {
+  description = "API Gateway endpoint URL"
+  value       = aws_apigatewayv2_stage.elysian.invoke_url
+}
+`,
+};

package/dist/cli/commands/init.d.ts

@@ -1,12 +1,7 @@
 /**
- * Init command - Initialize a new elysian project
+ * Init command - Interactive wizard to initialize elysian projects
  */
 export declare const initCommand: import("citty").CommandDef<{
-    name: {
-        type: "string";
-        description: string;
-        default: string;
-    };
     force: {
         type: "boolean";
         description: string;

package/dist/cli/commands/init.js

@@ -1,21 +1,19 @@
 /**
- * Init command - Initialize a new elysian project
+ * Init command - Interactive wizard to initialize elysian projects
  */
 import { defineCommand } from "citty";
 import consola from "consola";
 import { existsSync, mkdirSync } from "fs";
-import { join } from "path";
+import { resolve, basename } from "path";
+import { detectProject, } from "./init/detect";
+import { promptTargetDirectory, runFreshProjectWizard, runExistingProjectWizard, } from "./init/prompts";
+import { scaffoldProject, installDependencies, printResults, } from "./init/scaffold";
 export const initCommand = defineCommand({
     meta: {
         name: "init",
         description: "Initialize a new elysian project",
     },
     args: {
-        name: {
-            type: "string",
-            description: "API name",
-            default: "my-api",
-        },
         force: {
             type: "boolean",
             description: "Overwrite existing files",
@@ -23,273 +21,79 @@ export const initCommand = defineCommand({
         },
     },
     async run({ args }) {
-        const cwd = process.cwd();
-        const apiName = args.name;
-        consola.start(`Initializing elysian project: ${apiName}`);
-        // Check for existing config
-        const configPath = join(cwd, "elysian.config.ts");
-        if (existsSync(configPath) && !args.force) {
+        const originalCwd = process.cwd();
+        // Step 1: Get target directory
+        const targetDir = await promptTargetDirectory(basename(originalCwd));
+        if (!targetDir) {
+            consola.info("Cancelled");
+            process.exit(0);
+        }
+        // Resolve the target directory
+        const cwd = resolve(originalCwd, targetDir);
+        const apiName = basename(cwd);
+        // Create directory if it doesn't exist
+        if (!existsSync(cwd)) {
+            mkdirSync(cwd, { recursive: true });
+            consola.success(`Created directory: ${targetDir}`);
+        }
+        // Detect project state in target directory
+        const info = await detectProject(cwd);
+        // Check for existing config (unless force)
+        if (info.hasElysianConfig && !args.force) {
             consola.error("elysian.config.ts already exists. Use --force to overwrite.");
             process.exit(1);
         }
-        // Create directories
-        const lambdasDir = join(cwd, "src/lambdas");
-        const terraformDir = join(cwd, "terraform");
-        mkdirSync(lambdasDir, { recursive: true });
-        mkdirSync(terraformDir, { recursive: true });
-        consola.success("Created src/lambdas/");
-        consola.success("Created terraform/");
-        // Write config file
-        const configContent = `import { defineConfig } from "@actuallyjamez/elysian";
-
-export default defineConfig({
-	apiName: "${apiName}",
-
-	// Lambda source directory
-	lambdasDir: "src/lambdas",
-
-	// Build output directory
-	outputDir: "dist",
-
-	// OpenAPI configuration
-	openapi: {
-		enabled: true,
-		title: "${apiName}",
-		version: "1.0.0",
-		description: "API powered by Elysia and AWS Lambda",
-	},
-
-	// Terraform configuration
-	terraform: {
-		outputDir: "terraform",
-		tfvarsFilename: "api-routes.auto.tfvars",
-	},
-
-	// Lambda defaults
-	lambda: {
-		runtime: "nodejs20.x",
-		memorySize: 256,
-		timeout: 30,
-	},
-});
-`;
-        await Bun.write(configPath, configContent);
-        consola.success("Created elysian.config.ts");
-        // Write example lambda
-        const exampleLambdaPath = join(lambdasDir, "hello.ts");
-        if (!existsSync(exampleLambdaPath) || args.force) {
-            const exampleLambdaContent = `import { createLambda, t } from "@actuallyjamez/elysian";
-
-/**
- * Example Lambda - Hello World
- *
- * Routes defined here will be automatically:
- * - Bundled into a Lambda function
- * - Mapped to API Gateway routes
- * - Included in OpenAPI documentation
- */
-export default createLambda()
-	.get("/hello", ({ query }) => {
-		return \`Hello, \${query.name ?? "World"}!\`;
-	}, {
-		response: t.String(),
-		query: t.Object({
-			name: t.Optional(t.String()),
-		}),
-		detail: {
-			summary: "Say hello",
-			description: "Returns a greeting message",
-			tags: ["Greeting"],
-		},
-	});
-`;
-            await Bun.write(exampleLambdaPath, exampleLambdaContent);
-            consola.success("Created src/lambdas/hello.ts");
+        // Run appropriate wizard based on whether directory is empty
+        let answers;
+        if (info.isEmpty) {
+            const result = await runFreshProjectWizard(apiName);
+            if (!result) {
+                consola.info("Cancelled");
+                process.exit(0);
+            }
+            answers = {
+                targetDir,
+                apiName,
+                ...result,
+            };
+        }
+        else {
+            const result = await runExistingProjectWizard(apiName, info.packageManager);
+            if (!result) {
+                consola.info("Cancelled");
+                process.exit(0);
+            }
+            answers = {
+                targetDir,
+                apiName,
+                ...result,
+            };
         }
-        // Write Terraform main.tf template
-        const terraformMainPath = join(terraformDir, "main.tf");
-        if (!existsSync(terraformMainPath) || args.force) {
-            const terraformContent = `terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-  }
-}
-
-provider "aws" {
-  region = var.region
-}
-
-variable "region" {
-  type    = string
-  default = "eu-west-2"
-}
-
-variable "lambda_names" {
-  type    = list(string)
-  default = []
-}
-
-variable "api_routes" {
-  type = map(object({
-    lambda_key      = string
-    route_key       = string
-    path_parameters = list(string)
-  }))
-  default = {}
-}
-
-variable "lambda_runtime" {
-  type    = string
-  default = "nodejs20.x"
-}
-
-variable "lambda_memory_size" {
-  type    = number
-  default = 256
-}
-
-variable "lambda_timeout" {
-  type    = number
-  default = 30
-}
-
-variable "api_name" {
-  type    = string
-  default = "${apiName}"
-}
-
-variable "tags" {
-  type    = map(string)
-  default = {}
-}
-
-locals {
-  lambda_functions = {
-    for name in var.lambda_names : name => {
-      filename         = "\${path.module}/../dist/\${name}.zip"
-      handler          = "index.handler"
-      source_code_hash = filebase64sha256("\${path.module}/../dist/\${name}.zip")
-    }
-  }
-}
-
-# API Gateway
-resource "aws_apigatewayv2_api" "this" {
-  name          = var.api_name
-  protocol_type = "HTTP"
-  description   = "API Gateway for \${var.api_name}"
-  tags          = var.tags
-}
-
-# IAM Role for Lambda
-resource "aws_iam_role" "lambda" {
-  name = "\${var.api_name}-lambda-role"
-
-  assume_role_policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [{
-      Action = "sts:AssumeRole"
-      Effect = "Allow"
-      Principal = {
-        Service = "lambda.amazonaws.com"
-      }
-    }]
-  })
-
-  tags = var.tags
-}
-
-resource "aws_iam_role_policy_attachment" "lambda_basic" {
-  role       = aws_iam_role.lambda.name
-  policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-}
-
-# Lambda Functions
-resource "aws_lambda_function" "this" {
-  for_each = local.lambda_functions
-
-  filename         = each.value.filename
-  function_name    = "\${var.api_name}-\${each.key}"
-  role             = aws_iam_role.lambda.arn
-  handler          = each.value.handler
-  source_code_hash = each.value.source_code_hash
-  runtime          = var.lambda_runtime
-  memory_size      = var.lambda_memory_size
-  timeout          = var.lambda_timeout
-
-  tags = var.tags
-}
-
-# API Gateway Integrations
-resource "aws_apigatewayv2_integration" "this" {
-  for_each = local.lambda_functions
-
-  api_id             = aws_apigatewayv2_api.this.id
-  integration_type   = "AWS_PROXY"
-  integration_uri    = aws_lambda_function.this[each.key].invoke_arn
-  integration_method = "POST"
-  payload_format_version = "2.0"
-}
-
-# Lambda Permissions
-resource "aws_lambda_permission" "apigateway" {
-  for_each = local.lambda_functions
-
-  statement_id  = "AllowExecutionFromAPIGateway-\${each.key}"
-  action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.this[each.key].function_name
-  principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${aws_apigatewayv2_api.this.execution_arn}/*/*"
-}
-
-# API Gateway Routes
-resource "aws_apigatewayv2_route" "this" {
-  for_each = var.api_routes
-
-  api_id    = aws_apigatewayv2_api.this.id
-  route_key = each.value.route_key
-  target    = "integrations/\${aws_apigatewayv2_integration.this[each.value.lambda_key].id}"
-}
-
-# API Gateway Stage
-resource "aws_apigatewayv2_stage" "this" {
-  api_id      = aws_apigatewayv2_api.this.id
-  name        = "$default"
-  auto_deploy = true
-
-  tags = var.tags
-
-  depends_on = [
-    aws_apigatewayv2_route.this,
-    aws_lambda_permission.apigateway
-  ]
-}
-
-# Outputs
-output "api_endpoint" {
-  value = aws_apigatewayv2_stage.this.invoke_url
-}
-
-output "lambda_functions" {
-  value = { for k, v in aws_lambda_function.this : k => v.arn }
-}
-`;
-            await Bun.write(terraformMainPath, terraformContent);
-            consola.success("Created terraform/main.tf");
+        // Scaffold files
+        const scaffoldResult = await scaffoldProject(cwd, info, answers, args.force);
+        // Print results
+        printResults(cwd, scaffoldResult);
+        // Install dependencies if requested
+        if (answers.installDeps) {
+            try {
+                await installDependencies(cwd, answers.packageManager);
+            }
+            catch (error) {
+                consola.error(error instanceof Error ? error.message : "Failed to install dependencies");
+                consola.info(`You can manually install with: ${answers.packageManager} add elysia @actuallyjamez/elysian`);
+            }
         }
         // Print next steps
         console.log("");
+        const pm = answers.packageManager;
+        const runCmd = pm === "npm" ? "npm run" : pm;
+        // If we created in a subdirectory, tell user to cd into it
+        const cdStep = targetDir !== "." ? `cd ${targetDir}\n\n` : "";
         consola.box("Project initialized!\n\n" +
             "Next steps:\n\n" +
-            "1. Install dependencies:\n" +
-            "   bun add elysia @actuallyjamez/elysian\n\n" +
-            "2. Add more lambdas in src/lambdas/\n\n" +
-            "3. Build your lambdas:\n" +
-            "   bunx elysian build\n\n" +
-            "4. Deploy with Terraform:\n" +
-            "   cd terraform && terraform init && terraform apply");
+            cdStep +
+            (answers.installDeps ? "" : `${pm} add elysia @actuallyjamez/elysian\n\n`) +
+            `${runCmd} elysian build\n\n` +
+            "cd terraform && terraform init && terraform apply");
     },
 });

package/dist/core/config.d.ts

@@ -20,7 +20,7 @@ export interface BuildConfig {
     external?: string[];
 }
 export interface LambdaConfig {
-    /** Lambda runtime (default: "nodejs20.x") */
+    /** Lambda runtime (default: "nodejs22.x") */
     runtime?: string;
     /** Lambda memory size in MB (default: 256) */
     memorySize?: number;