@expressots/cli 3.0.0 → 4.0.0-preview.3

package/bin/migrate/generators/heroku-to-render.js

@@ -0,0 +1,148 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateHerokuToRender = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const template_loader_1 = require("./template-loader");
+async function generateHerokuToRender(outputDir, options) {
+    console.log(chalk_1.default.yellow("  Generating Heroku → Render migration..."));
+    const vars = (0, template_loader_1.buildMigrationVars)(options);
+    // Generate render.yaml
+    const renderConfig = `# Render Blueprint
+# Generated by ExpressoTS CLI
+
+services:
+  - type: web
+    name: expressots-app
+    env: node
+    region: oregon
+    plan: starter
+    buildCommand: npm install && npm run build
+    startCommand: npm start
+    healthCheckPath: /health
+    envVars:
+      - key: NODE_ENV
+        value: production
+      - key: PORT
+        value: 3000
+      # Add your environment variables below
+      # - key: DATABASE_URL
+      #   fromDatabase:
+      #     name: expressots-db
+      #     property: connectionString
+
+# Uncomment to add a PostgreSQL database
+# databases:
+#   - name: expressots-db
+#     plan: starter
+#     databaseName: expressots
+#     user: expressots
+`;
+    fs_1.default.writeFileSync(path_1.default.join(outputDir, "render.yaml"), renderConfig, "utf-8");
+    console.log(chalk_1.default.green("    ✓ Created render.yaml"));
+    // Generate migration checklist
+    const checklist = generateRenderChecklist();
+    fs_1.default.writeFileSync(path_1.default.join(outputDir, "MIGRATION_CHECKLIST.md"), checklist, "utf-8");
+    console.log(chalk_1.default.green("    ✓ Created MIGRATION_CHECKLIST.md"));
+    // Generate environment mapping
+    if (options.includeSecrets) {
+        const envMapping = generateRenderEnvMapping();
+        fs_1.default.writeFileSync(path_1.default.join(outputDir, "env-mapping.md"), envMapping, "utf-8");
+        console.log(chalk_1.default.green("    ✓ Created env-mapping.md"));
+    }
+}
+exports.generateHerokuToRender = generateHerokuToRender;
+function generateRenderChecklist() {
+    return `# Migration Checklist: Heroku → Render
+
+## Pre-Migration
+
+- [ ] Export Heroku environment variables
+- [ ] Backup database
+- [ ] Document Heroku add-ons
+
+## Render Setup
+
+- [ ] Create Render account at https://render.com
+- [ ] Copy \`render.yaml\` to project root
+- [ ] Connect GitHub/GitLab repository
+
+## Deployment Options
+
+### Option 1: Blueprint (Recommended)
+- [ ] Push \`render.yaml\` to repository
+- [ ] In Render dashboard, click "New" → "Blueprint"
+- [ ] Select your repository
+- [ ] Render will create all services defined in render.yaml
+
+### Option 2: Manual Setup
+- [ ] Create Web Service in Render dashboard
+- [ ] Connect repository
+- [ ] Configure build and start commands
+- [ ] Set environment variables
+
+## Database Migration
+
+- [ ] Create PostgreSQL in Render
+- [ ] Export Heroku database: \`heroku pg:backups:capture\`
+- [ ] Download backup: \`heroku pg:backups:download\`
+- [ ] Import to Render PostgreSQL
+
+## Environment Variables
+
+- [ ] Set all required environment variables in Render dashboard
+- [ ] Configure \`DATABASE_URL\` from Render PostgreSQL
+
+## Custom Domain
+
+- [ ] Add custom domain in Render
+- [ ] Update DNS records (CNAME to *.onrender.com)
+- [ ] Wait for SSL certificate provisioning
+
+## Post-Migration
+
+- [ ] Verify all endpoints work
+- [ ] Monitor logs in Render dashboard
+- [ ] Disable Heroku app after verification
+`;
+}
+function generateRenderEnvMapping() {
+    return `# Environment Variable Mapping: Heroku → Render
+
+## Automatic Variables
+
+| Heroku | Render | Notes |
+|--------|--------|-------|
+| \`PORT\` | \`PORT\` | Render sets this automatically |
+| \`DATABASE_URL\` | \`DATABASE_URL\` | Use fromDatabase in render.yaml |
+
+## Manual Configuration
+
+Set these in Render dashboard or render.yaml:
+
+\`\`\`yaml
+envVars:
+  - key: NODE_ENV
+    value: production
+  - key: API_KEY
+    sync: false  # Prompt during deploy
+  - key: DATABASE_URL
+    fromDatabase:
+      name: your-db
+      property: connectionString
+\`\`\`
+
+## Heroku Add-on Equivalents
+
+| Heroku Add-on | Render Alternative |
+|---------------|-------------------|
+| Heroku Postgres | Render PostgreSQL |
+| Heroku Redis | Render Redis |
+| Papertrail | Render Logs (built-in) |
+| SendGrid | External service |
+`;
+}

package/bin/migrate/generators/index.d.ts

@@ -0,0 +1,7 @@
+export { generateHerokuToRailway } from "./heroku-to-railway";
+export { generateHerokuToRender } from "./heroku-to-render";
+export { generateHerokuToFly } from "./heroku-to-fly";
+export { generateComposeToK8s } from "./compose-to-k8s";
+export { generateComposeToRailway } from "./compose-to-railway";
+export { generateComposeToRender } from "./compose-to-render";
+export { generateGenericMigration } from "./generic-migration";

package/bin/migrate/generators/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateGenericMigration = exports.generateComposeToRender = exports.generateComposeToRailway = exports.generateComposeToK8s = exports.generateHerokuToFly = exports.generateHerokuToRender = exports.generateHerokuToRailway = void 0;
+var heroku_to_railway_1 = require("./heroku-to-railway");
+Object.defineProperty(exports, "generateHerokuToRailway", { enumerable: true, get: function () { return heroku_to_railway_1.generateHerokuToRailway; } });
+var heroku_to_render_1 = require("./heroku-to-render");
+Object.defineProperty(exports, "generateHerokuToRender", { enumerable: true, get: function () { return heroku_to_render_1.generateHerokuToRender; } });
+var heroku_to_fly_1 = require("./heroku-to-fly");
+Object.defineProperty(exports, "generateHerokuToFly", { enumerable: true, get: function () { return heroku_to_fly_1.generateHerokuToFly; } });
+var compose_to_k8s_1 = require("./compose-to-k8s");
+Object.defineProperty(exports, "generateComposeToK8s", { enumerable: true, get: function () { return compose_to_k8s_1.generateComposeToK8s; } });
+var compose_to_railway_1 = require("./compose-to-railway");
+Object.defineProperty(exports, "generateComposeToRailway", { enumerable: true, get: function () { return compose_to_railway_1.generateComposeToRailway; } });
+var compose_to_render_1 = require("./compose-to-render");
+Object.defineProperty(exports, "generateComposeToRender", { enumerable: true, get: function () { return compose_to_render_1.generateComposeToRender; } });
+var generic_migration_1 = require("./generic-migration");
+Object.defineProperty(exports, "generateGenericMigration", { enumerable: true, get: function () { return generic_migration_1.generateGenericMigration; } });

package/bin/migrate/generators/template-loader.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Template loader for migration generators
+ * Handles remote template fetching with fallback to embedded templates
+ */
+import type { MigrationOptions } from "../form";
+export interface TemplateResult {
+    content: string;
+    source: "remote" | "embedded";
+}
+/**
+ * Load migration template with fallback
+ */
+export declare function loadMigrationTemplate(from: string, to: string, file: string, variables: Record<string, unknown>, embeddedGenerator: () => string): Promise<TemplateResult>;
+/**
+ * Build migration template variables
+ */
+export declare function buildMigrationVars(options: MigrationOptions): Record<string, unknown>;
+/**
+ * Log template source for debugging
+ */
+export declare function logTemplateSource(templateName: string, source: "remote" | "embedded"): void;

package/bin/migrate/generators/template-loader.js

@@ -0,0 +1,59 @@
+"use strict";
+/**
+ * Template loader for migration generators
+ * Handles remote template fetching with fallback to embedded templates
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logTemplateSource = exports.buildMigrationVars = exports.loadMigrationTemplate = void 0;
+const templates_1 = require("../../templates");
+/**
+ * Load migration template with fallback
+ */
+async function loadMigrationTemplate(from, to, file, variables, embeddedGenerator) {
+    const manager = (0, templates_1.getTemplateManager)();
+    try {
+        // Try to fetch from remote template repository
+        const result = await manager.fetchMigrationTemplate(from, to, file);
+        if (result.data) {
+            // Template found, render with variables
+            const renderOptions = {
+                variables: variables,
+            };
+            const rendered = manager.render(result.data, renderOptions);
+            return { content: rendered, source: "remote" };
+        }
+    }
+    catch {
+        // Remote fetch failed, fall back to embedded
+    }
+    // Fall back to embedded template generator
+    return {
+        content: embeddedGenerator(),
+        source: "embedded",
+    };
+}
+exports.loadMigrationTemplate = loadMigrationTemplate;
+/**
+ * Build migration template variables
+ */
+function buildMigrationVars(options) {
+    return {
+        from: options.from,
+        to: options.to,
+        includeSecrets: options.includeSecrets,
+        includeData: options.includeData,
+        dryRun: options.dryRun,
+        outputDir: options.outputDir,
+    };
+}
+exports.buildMigrationVars = buildMigrationVars;
+/**
+ * Log template source for debugging
+ */
+function logTemplateSource(templateName, source) {
+    if (process.env.EXPRESSOTS_DEBUG) {
+        const sourceLabel = source === "remote" ? "remote template" : "embedded template";
+        console.log(`  [DEBUG] ${templateName}: Using ${sourceLabel}`);
+    }
+}
+exports.logTemplateSource = logTemplateSource;

package/bin/migrate/index.d.ts

@@ -0,0 +1 @@
+export { migrateCommand } from "./cli";

package/bin/migrate/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateCommand = void 0;
+var cli_1 = require("./cli");
+Object.defineProperty(exports, "migrateCommand", { enumerable: true, get: function () { return cli_1.migrateCommand; } });

package/bin/new/cli.d.ts

@@ -1,4 +1,8 @@
 import { CommandModule } from "yargs";
 type CommandModuleArgs = object;
+export declare const PACKAGE_MANAGER_CHOICES: readonly ["npm", "yarn", "pnpm", ...string[]];
+export declare const TEMPLATE_CHOICES: readonly ["application", "micro"];
+export declare const MIDDLEWARE_PRESET_CHOICES: readonly ["api", "web", "graphql", "microservice", "minimal"];
+declare const NEW_COMMAND_EPILOG: string;
 declare const createProject: () => CommandModule<CommandModuleArgs, any>;
-export { createProject };
+export { createProject, NEW_COMMAND_EPILOG };

package/bin/new/cli.js

@@ -3,49 +3,110 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProject = void 0;
-const form_1 = require("./form");
+exports.NEW_COMMAND_EPILOG = exports.createProject = exports.MIDDLEWARE_PRESET_CHOICES = exports.TEMPLATE_CHOICES = exports.PACKAGE_MANAGER_CHOICES = void 0;
+const chalk_1 = __importDefault(require("chalk"));
 const semver_1 = __importDefault(require("semver"));
+const form_1 = require("./form");
 const cli_ui_1 = require("../utils/cli-ui");
-const chalk_1 = __importDefault(require("chalk"));
-const packageManagers = [
+exports.PACKAGE_MANAGER_CHOICES = [
     "npm",
     "yarn",
     "pnpm",
     ...(process.platform !== "win32" ? ["bun"] : []),
 ];
+exports.TEMPLATE_CHOICES = ["application", "micro"];
+exports.MIDDLEWARE_PRESET_CHOICES = [
+    "api",
+    "web",
+    "graphql",
+    "microservice",
+    "minimal",
+];
+const formatInlineChoices = (choices) => choices.join(", ");
+const NEW_COMMAND_EPILOG = [
+    chalk_1.default.bold("Available choices"),
+    "",
+    chalk_1.default.bold("Templates") + ` (${formatInlineChoices(exports.TEMPLATE_CHOICES)})`,
+    "  application   Full REST/GraphQL API (DI, controllers, lifecycle, presets)",
+    "  micro         Single-file HTTP service via micro(), no DI container",
+    chalk_1.default.dim("  Tip: add -e / --events with application to scaffold application-with-events"),
+    "",
+    chalk_1.default.bold("Package managers") +
+        ` (${formatInlineChoices(exports.PACKAGE_MANAGER_CHOICES)})`,
+    ...(process.platform === "win32"
+        ? [chalk_1.default.dim("  bun is not available on Windows")]
+        : []),
+    "",
+    chalk_1.default.bold("Middleware presets") +
+        ` (${formatInlineChoices(exports.MIDDLEWARE_PRESET_CHOICES)})` +
+        chalk_1.default.dim(" (application template only)"),
+    "  api            REST API: security, compression, rate limit (default)",
+    "  web            api + cookies and session",
+    "  graphql        GraphQL stack + Apollo scaffold",
+    "  microservice   Minimal parsing + compression",
+    "  minimal        parse() only; wire the rest yourself",
+    "",
+    chalk_1.default.bold("Flags"),
+    "  -e, --events   boolean: use application-with-events (not a separate -t value)",
+    "",
+    chalk_1.default.bold("Provider packages") +
+        chalk_1.default.dim(" (not expressots new): expressots create --provider <name>"),
+    "",
+    chalk_1.default.bold("Silent vs interactive"),
+    "  Pass -t and -p together for non-interactive scaffold (CI-friendly).",
+    "  Omit both for prompts (template, package manager, preset, events).",
+].join("\n");
+exports.NEW_COMMAND_EPILOG = NEW_COMMAND_EPILOG;
 const commandOptions = (yargs) => {
+    const terminalWidth = typeof process.stdout.columns === "number" && process.stdout.columns > 0
+        ? Math.max(process.stdout.columns, 100)
+        : 120;
     return yargs
+        .wrap(terminalWidth)
         .positional("project-name", {
         describe: "The name of the project",
         type: "string",
     })
         .option("template", {
-        describe: "The project template to use",
+        describe: "Project template",
         type: "string",
-        choices: ["opinionated", "non-opinionated", "micro"],
+        choices: [...exports.TEMPLATE_CHOICES],
         alias: "t",
     })
         .option("package-manager", {
-        describe: "The package manager to use",
+        describe: "Package manager",
         type: "string",
-        choices: packageManagers,
+        choices: [...exports.PACKAGE_MANAGER_CHOICES],
         alias: "p",
+    })
+        .option("preset", {
+        describe: "Middleware preset (application template only)",
+        type: "string",
+        choices: [...exports.MIDDLEWARE_PRESET_CHOICES],
+        alias: "s",
+    })
+        .option("events", {
+        describe: "Scaffold application-with-events (boolean flag; do not pass a value)",
+        type: "boolean",
+        alias: "e",
     })
         .option("directory", {
-        describe: "The directory for new project",
+        describe: "Parent directory for the new project",
         type: "string",
         alias: "d",
     })
         .implies("package-manager", "template")
-        .implies("template", "package-manager");
+        .implies("template", "package-manager")
+        .implies("preset", "template")
+        .implies("events", "template")
+        .epilog(NEW_COMMAND_EPILOG);
 };
 const checkNodeVersion = () => {
-    const minVersion = "18.0.0";
-    const maxVersion = "22.5.1";
+    const minVersion = "20.0.0";
+    const maxVersion = "24.0.0";
     const currentVersion = process.version;
     if (!semver_1.default.satisfies(currentVersion, `>=${minVersion} <=${maxVersion}`)) {
-        const msg = `Node.js version [${chalk_1.default.bold(chalk_1.default.white(currentVersion))}] is not tested. Please use a version between ${minVersion} and ${maxVersion}.`;
+        const msg = `Node.js version [${chalk_1.default.bold(chalk_1.default.white(currentVersion))}] is not fully tested. Recommended: v20.x or v22.x LTS.`;
         (0, cli_ui_1.printWarning)(msg);
     }
 };
@@ -54,12 +115,14 @@ const createProject = () => {
         command: "new <project-name> [package-manager] [template] [directory]",
         describe: "Create ExpressoTS application.",
         builder: commandOptions,
-        handler: async ({ projectName, packageManager, template, directory, }) => {
+        handler: async ({ projectName, packageManager, template, directory, preset, events, }) => {
             checkNodeVersion();
             return await (0, form_1.projectForm)(projectName, [
                 packageManager,
                 template,
                 directory,
+                preset,
+                events,
             ]);
         },
     };

package/bin/new/form.d.ts

@@ -1,7 +1,10 @@
+/**
+ * Template definitions for v4.0
+ */
 declare enum Template {
-    nonopinionated = "Non-Opinionated :: Start with a clean slate and build your project from scratch.",
-    opinionated = "Opinionated :: Automatically scaffolds resources into a preset project structure. (Recommended)",
-    micro = "Micro :: A minimalistic template for building micro api's."
+    application = "Application :: Full-featured ExpressoTS application. (Recommended)",
+    applicationWithEvents = "Application with Events :: Application template pre-wired with the type-safe Event Bus example.",
+    micro = "Micro :: A minimalistic template for building micro APIs and serverless functions."
 }
 declare const enum PackageManager {
     npm = "npm",
@@ -9,7 +12,27 @@ declare const enum PackageManager {
     pnpm = "pnpm",
     bun = "bun"
 }
+/**
+ * Middleware presets for Application template
+ */
+declare enum MiddlewarePreset {
+    api = "API :: REST API with security, compression, and auto-logging. (Recommended)",
+    web = "Web :: Full web app with cookies and session support.",
+    graphql = "GraphQL :: Optimized for GraphQL APIs.",
+    microservice = "Microservice :: Minimal setup for microservices.",
+    minimal = "Minimal :: Just request parsing, customize everything yourself."
+}
 type TemplateKeys = keyof typeof Template;
-type ProjectFormArgs = [PackageManager, TemplateKeys, string];
+type MiddlewarePresetKeys = keyof typeof MiddlewarePreset;
+type ProjectFormArgs = [
+    PackageManager,
+    TemplateKeys,
+    string,
+    MiddlewarePresetKeys,
+    boolean | undefined
+];
+/**
+ * Main project creation form
+ */
 declare const projectForm: (projectName: string, args: ProjectFormArgs) => Promise<void>;
 export { projectForm };