create-authhero 0.7.0 → 0.9.0

package/dist/create-authhero.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import { Command as b } from "commander";
-import d from "inquirer";
-import l from "fs";
-import c from "path";
-import { spawn as f } from "child_process";
-const w = new b(), r = {
+import { Command as x } from "commander";
+import c from "inquirer";
+import i from "fs";
+import f from "path";
+import { spawn as b } from "child_process";
+const D = new x(), n = {
   local: {
     name: "Local (SQLite)",
     description: "Local development setup with SQLite database - great for getting started",
     templateDir: "local",
-    packageJson: (t) => ({
-      name: t,
+    packageJson: (r) => ({
+      name: r,
       version: "1.0.0",
       type: "module",
       scripts: {
@@ -42,16 +42,22 @@ const w = new b(), r = {
     name: "Cloudflare Simple (Single Tenant)",
     description: "Single-tenant Cloudflare Workers setup with D1 database",
     templateDir: "cloudflare-simple",
-    packageJson: (t) => ({
-      name: t,
+    packageJson: (r) => ({
+      name: r,
       version: "1.0.0",
       type: "module",
       scripts: {
-        dev: "wrangler dev",
+        "dev:local": "wrangler dev --port 3000 --local-protocol https",
+        "dev:remote": "wrangler dev --port 3000 --local-protocol https --remote",
+        dev: "wrangler dev --port 3000 --local-protocol https",
         deploy: "wrangler deploy",
-        "db:migrate": "wrangler d1 migrations apply AUTH_DB --local",
-        "db:migrate:prod": "wrangler d1 migrations apply AUTH_DB --remote",
-        seed: "wrangler d1 execute AUTH_DB --local --file=seed.sql"
+        "db:migrate:local": "wrangler d1 migrations apply AUTH_DB --local",
+        "db:migrate:remote": "wrangler d1 migrations apply AUTH_DB --remote",
+        migrate: "wrangler d1 migrations apply AUTH_DB --local",
+        "db:generate": "drizzle-kit generate",
+        "seed:local": "node seed-helper.js",
+        "seed:remote": "node seed-helper.js '' '' remote",
+        seed: "node seed-helper.js"
       },
       dependencies: {
         "@authhero/kysely-adapter": "latest",
@@ -64,57 +70,63 @@ const w = new b(), r = {
       },
       devDependencies: {
         "@cloudflare/workers-types": "^4.0.0",
+        "drizzle-kit": "^0.31.0",
+        "drizzle-orm": "^0.44.0",
         typescript: "^5.5.0",
         wrangler: "^3.0.0"
       }
     }),
-    seedFile: "seed.sql"
+    seedFile: "seed.ts"
   },
   "cloudflare-multitenant": {
     name: "Cloudflare Multi-Tenant (Production)",
-    description: "Production-grade multi-tenant setup with per-tenant D1 databases and Analytics Engine",
+    description: "Production-grade multi-tenant setup with D1 database and tenant management",
     templateDir: "cloudflare-multitenant",
-    packageJson: (t) => ({
-      name: t,
+    packageJson: (r) => ({
+      name: r,
       version: "1.0.0",
       type: "module",
       scripts: {
-        dev: "wrangler dev",
+        "dev:local": "wrangler dev --port 3000 --local-protocol https",
+        "dev:remote": "wrangler dev --port 3000 --local-protocol https --remote",
+        dev: "wrangler dev --port 3000 --local-protocol https",
         deploy: "wrangler deploy",
-        "db:migrate": "wrangler d1 migrations apply MAIN_DB --local",
-        "db:migrate:prod": "wrangler d1 migrations apply MAIN_DB --remote",
-        seed: "wrangler d1 execute MAIN_DB --local --file=seed.sql"
+        "db:migrate:local": "wrangler d1 migrations apply AUTH_DB --local",
+        "db:migrate:remote": "wrangler d1 migrations apply AUTH_DB --remote",
+        migrate: "wrangler d1 migrations apply AUTH_DB --local",
+        "db:generate": "drizzle-kit generate",
+        "seed:local": "node seed-helper.js",
+        "seed:remote": "node seed-helper.js '' '' remote",
+        seed: "node seed-helper.js"
       },
       dependencies: {
-        "@authhero/cloudflare-adapter": "latest",
         "@authhero/kysely-adapter": "latest",
-        "@authhero/multi-tenancy": "latest",
         "@hono/swagger-ui": "^0.5.0",
-        "@hono/zod-openapi": "^0.19.10",
+        "@hono/zod-openapi": "^0.19.0",
         authhero: "latest",
         hono: "^4.6.0",
         kysely: "latest",
-        "kysely-d1": "latest",
-        wretch: "^3.0.0"
+        "kysely-d1": "latest"
       },
       devDependencies: {
         "@cloudflare/workers-types": "^4.0.0",
+        "drizzle-kit": "^0.31.0",
+        "drizzle-orm": "^0.44.0",
         typescript: "^5.5.0",
         wrangler: "^3.0.0"
       }
     }),
-    seedFile: "seed.sql"
+    seedFile: "seed.ts"
   }
 };
-function v(t, e) {
-  l.readdirSync(t).forEach((s) => {
-    const n = c.join(t, s), o = c.join(e, s);
-    l.lstatSync(n).isDirectory() ? (l.mkdirSync(o, { recursive: !0 }), v(n, o)) : l.copyFileSync(n, o);
+function A(r, a) {
+  i.readdirSync(r).forEach((o) => {
+    const t = f.join(r, o), e = f.join(a, o);
+    i.lstatSync(t).isDirectory() ? (i.mkdirSync(e, { recursive: !0 }), A(t, e)) : i.copyFileSync(t, e);
   });
 }
-function D(t) {
-  if (t === "local")
-    return `import { SqliteDialect, Kysely } from "kysely";
+function $() {
+  return `import { SqliteDialect, Kysely } from "kysely";
 import Database from "better-sqlite3";
 import createAdapters from "@authhero/kysely-adapter";
 import { seed } from "authhero";
@@ -146,61 +158,45 @@ async function main() {
 
 main().catch(console.error);
 `;
-  {
-    const e = (/* @__PURE__ */ new Date()).toISOString(), a = "default";
-    return `-- Seed file for AuthHero
--- 
--- IMPORTANT: This SQL file creates the basic structure but the password
--- cannot be properly hashed in SQL. After running this seed, you should
--- use the management API or run a script to set the admin password.
-
--- Create default tenant
-INSERT OR IGNORE INTO tenants (id, friendly_name, audience, sender_email, sender_name, created_at, updated_at)
-VALUES ('${a}', 'Default Tenant', 'https://api.example.com', 'noreply@example.com', 'AuthHero', '${e}', '${e}');
-
--- Create password connection
-INSERT OR IGNORE INTO connections (id, tenant_id, name, strategy, options, created_at, updated_at)
-VALUES ('conn_default', '${a}', 'Username-Password-Authentication', 'Username-Password-Authentication', '{}', '${e}', '${e}');
-
--- Create default client
-INSERT OR IGNORE INTO clients (client_id, tenant_id, name, callbacks, allowed_origins, web_origins, connections, created_at, updated_at)
-VALUES ('default', '${a}', 'Default Application', '["https://manage.authhero.net/auth-callback","https://local.authhero.net/auth-callback"]', '[]', '[]', '["Username-Password-Authentication"]', '${e}', '${e}');
-
--- Note: Admin user and password should be created via the management API
--- or using a TypeScript seed script with proper bcrypt hashing.
--- Example command: curl -X POST http://localhost:3000/api/v2/users ...
-`;
-  }
 }
-function u(t, e) {
-  return new Promise((a, s) => {
-    const n = f(t, [], {
-      cwd: e,
+function v(r, a) {
+  return new Promise((s, o) => {
+    const t = b(r, [], {
+      cwd: a,
       shell: !0,
       stdio: "inherit"
     });
-    n.on("close", (o) => {
-      o === 0 ? a() : s(new Error(`Command failed with exit code ${o}`));
-    }), n.on("error", s);
+    t.on("close", (e) => {
+      e === 0 ? s() : o(new Error(`Command failed with exit code ${e}`));
+    }), t.on("error", o);
   });
 }
-function k(t, e, a) {
-  return new Promise((s, n) => {
-    const o = f(t, [], {
-      cwd: e,
+function S(r, a, s) {
+  return new Promise((o, t) => {
+    const e = b(r, [], {
+      cwd: a,
       shell: !0,
       stdio: "inherit",
-      env: { ...process.env, ...a }
+      env: { ...process.env, ...s }
     });
-    o.on("close", (m) => {
-      m === 0 ? s() : n(new Error(`Command failed with exit code ${m}`));
-    }), o.on("error", n);
+    e.on("close", (g) => {
+      g === 0 ? o() : t(new Error(`Command failed with exit code ${g}`));
+    }), e.on("error", t);
   });
 }
-w.version("1.0.0").description("Create a new AuthHero project").argument("[project-name]", "name of the project").action(async (t) => {
+D.version("1.0.0").description("Create a new AuthHero project").argument("[project-name]", "name of the project").option(
+  "-t, --template <type>",
+  "template type: local, cloudflare-simple, or cloudflare-multitenant"
+).option("-e, --email <email>", "admin email address").option("-p, --password <password>", "admin password (min 8 characters)").option(
+  "--package-manager <pm>",
+  "package manager to use: npm, yarn, pnpm, or bun"
+).option("--skip-install", "skip installing dependencies").option("--skip-migrate", "skip running database migrations").option("--skip-seed", "skip seeding the database").option("--skip-start", "skip starting the development server").option("--remote", "use remote mode for cloudflare-simple (production D1)").option("-y, --yes", "skip all prompts and use defaults/provided options").action(async (r, a) => {
+  const s = a.yes === !0;
   console.log(`
 🔐 Welcome to AuthHero!
-`), t || (t = (await d.prompt([
+`);
+  let o = r;
+  o || (s ? (o = "auth-server", console.log(`Using default project name: ${o}`)) : o = (await c.prompt([
     {
       type: "input",
       name: "projectName",
@@ -209,60 +205,71 @@ w.version("1.0.0").description("Create a new AuthHero project").argument("[proje
       validate: (p) => p !== "" || "Project name cannot be empty"
     }
   ])).projectName);
-  const e = c.join(process.cwd(), t);
-  l.existsSync(e) && (console.error(`❌ Project "${t}" already exists.`), process.exit(1));
-  const { setupType: a } = await d.prompt([
+  const t = f.join(process.cwd(), o);
+  i.existsSync(t) && (console.error(`❌ Project "${o}" already exists.`), process.exit(1));
+  let e;
+  a.template ? (["local", "cloudflare-simple", "cloudflare-multitenant"].includes(
+    a.template
+  ) || (console.error(`❌ Invalid template: ${a.template}`), console.error(
+    "Valid options: local, cloudflare-simple, cloudflare-multitenant"
+  ), process.exit(1)), e = a.template, console.log(`Using template: ${n[e].name}`)) : e = (await c.prompt([
     {
       type: "list",
       name: "setupType",
       message: "Select your setup type:",
       choices: [
         {
-          name: `${r.local.name}
-     ${r.local.description}`,
+          name: `${n.local.name}
+     ${n.local.description}`,
           value: "local",
-          short: r.local.name
+          short: n.local.name
         },
         {
-          name: `${r["cloudflare-simple"].name}
-     ${r["cloudflare-simple"].description}`,
+          name: `${n["cloudflare-simple"].name}
+     ${n["cloudflare-simple"].description}`,
           value: "cloudflare-simple",
-          short: r["cloudflare-simple"].name
+          short: n["cloudflare-simple"].name
         },
         {
-          name: `${r["cloudflare-multitenant"].name}
-     ${r["cloudflare-multitenant"].description}`,
+          name: `${n["cloudflare-multitenant"].name}
+     ${n["cloudflare-multitenant"].description}`,
           value: "cloudflare-multitenant",
-          short: r["cloudflare-multitenant"].name
+          short: n["cloudflare-multitenant"].name
         }
       ]
     }
-  ]), s = r[a];
-  l.mkdirSync(e, { recursive: !0 }), l.writeFileSync(
-    c.join(e, "package.json"),
-    JSON.stringify(s.packageJson(t), null, 2)
+  ])).setupType;
+  const g = n[e];
+  i.mkdirSync(t, { recursive: !0 }), i.writeFileSync(
+    f.join(t, "package.json"),
+    JSON.stringify(g.packageJson(o), null, 2)
   );
-  const n = c.join(
+  const k = f.join(
     import.meta.url.replace("file://", "").replace("/create-authhero.js", ""),
-    s.templateDir
+    g.templateDir
   );
-  l.existsSync(n) ? v(n, e) : (console.error(`❌ Template directory not found: ${n}`), process.exit(1));
-  const o = D(a), m = a === "local" ? "src/seed.ts" : "seed.sql";
-  l.writeFileSync(c.join(e, m), o), console.log(
+  if (i.existsSync(k) ? A(k, t) : (console.error(`❌ Template directory not found: ${k}`), process.exit(1)), e === "local") {
+    const l = $();
+    i.writeFileSync(f.join(t, "src/seed.ts"), l);
+  }
+  console.log(
     `
-✅ Project "${t}" has been created with ${s.name} setup!
+✅ Project "${o}" has been created with ${g.name} setup!
 `
   );
-  const { shouldInstall: h } = await d.prompt([
+  let h;
+  if (a.skipInstall ? h = !1 : s ? h = !0 : h = (await c.prompt([
     {
       type: "confirm",
       name: "shouldInstall",
       message: "Would you like to install dependencies now?",
       default: !0
     }
-  ]);
-  if (h) {
-    const { packageManager: i } = await d.prompt([
+  ])).shouldInstall, h) {
+    let l;
+    a.packageManager ? (["npm", "yarn", "pnpm", "bun"].includes(a.packageManager) || (console.error(
+      `❌ Invalid package manager: ${a.packageManager}`
+    ), console.error("Valid options: npm, yarn, pnpm, bun"), process.exit(1)), l = a.packageManager) : s ? l = "npm" : l = (await c.prompt([
       {
         type: "list",
         name: "packageManager",
@@ -275,70 +282,131 @@ w.version("1.0.0").description("Create a new AuthHero project").argument("[proje
         ],
         default: "npm"
       }
-    ]);
-    console.log(`
-📦 Installing dependencies with ${i}...
+    ])).packageManager, console.log(`
+📦 Installing dependencies with ${l}...
 `);
     try {
-      const p = i === "pnpm" ? "pnpm install --ignore-workspace" : `${i} install`;
-      if (await u(p, e), a === "local" && (console.log(`
+      const p = l === "pnpm" ? "pnpm install --ignore-workspace" : `${l} install`;
+      await v(p, t), e === "local" && (console.log(`
 🔧 Building native modules...
-`), await u("npm rebuild better-sqlite3", e)), console.log(`
+`), await v("npm rebuild better-sqlite3", t)), console.log(`
 ✅ Dependencies installed successfully!
-`), a === "local") {
-        const { shouldSetup: A } = await d.prompt([
+`);
+      let w = a.remote ? "remote" : "local";
+      if (e === "local" || e === "cloudflare-simple" || e === "cloudflare-multitenant") {
+        (e === "cloudflare-simple" || e === "cloudflare-multitenant") && !s && !a.remote && (w = (await c.prompt([
+          {
+            type: "list",
+            name: "mode",
+            message: "Would you like to run in local mode or remote mode?",
+            choices: [
+              {
+                name: "Local (using local D1 database)",
+                value: "local",
+                short: "Local"
+              },
+              {
+                name: "Remote (using production D1 database)",
+                value: "remote",
+                short: "Remote"
+              }
+            ],
+            default: "local"
+          }
+        ])).mode);
+        let u;
+        if (a.skipMigrate && a.skipSeed ? u = !1 : s ? u = !a.skipMigrate || !a.skipSeed : u = (await c.prompt([
           {
             type: "confirm",
             name: "shouldSetup",
             message: "Would you like to run migrations and seed the database?",
             default: !0
           }
-        ]);
-        if (A) {
-          const y = await d.prompt([
+        ])).shouldSetup, u) {
+          let d;
+          if (a.email && a.password ? (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(a.email) || (console.error("❌ Invalid email address provided"), process.exit(1)), a.password.length < 8 && (console.error("❌ Password must be at least 8 characters"), process.exit(1)), d = {
+            username: a.email,
+            password: a.password
+          }, console.log(`Using admin email: ${a.email}`)) : d = await c.prompt([
             {
               type: "input",
               name: "username",
               message: "Admin email:",
               default: "admin@example.com",
-              validate: (g) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(g) || "Please enter a valid email address"
+              validate: (m) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(m) || "Please enter a valid email address"
             },
             {
               type: "password",
               name: "password",
               message: "Admin password:",
               mask: "*",
-              validate: (g) => g.length < 8 ? "Password must be at least 8 characters" : !0
+              validate: (m) => m.length < 8 ? "Password must be at least 8 characters" : !0
             }
-          ]);
-          console.log(`
+          ]), !a.skipMigrate) {
+            console.log(`
 🔄 Running migrations...
-`), await u(`${i} run migrate`, e), console.log(`
+`);
+            const m = (e === "cloudflare-simple" || e === "cloudflare-multitenant") && w === "remote" ? `${l} run db:migrate:remote` : `${l} run migrate`;
+            await v(m, t);
+          }
+          if (!a.skipSeed)
+            if (console.log(`
 🌱 Seeding database...
-`), await k(`${i} run seed`, e, {
-            ADMIN_EMAIL: y.username,
-            ADMIN_PASSWORD: y.password
-          });
+`), e === "local")
+              await S(
+                `${l} run seed`,
+                t,
+                {
+                  ADMIN_EMAIL: d.username,
+                  ADMIN_PASSWORD: d.password
+                }
+              );
+            else {
+              const m = w === "remote" ? `${l} run seed:remote` : `${l} run seed:local`;
+              await S(m, t, {
+                ADMIN_EMAIL: d.username,
+                ADMIN_PASSWORD: d.password
+              });
+            }
         }
       }
-      const { shouldStart: S } = await d.prompt([
+      let y;
+      if (a.skipStart || s ? y = !1 : y = (await c.prompt([
         {
           type: "confirm",
           name: "shouldStart",
           message: "Would you like to start the development server?",
           default: !0
         }
-      ]);
-      S && (console.log(`
-🚀 Starting development server...
-`), await u(`${i} run dev`, e));
+      ])).shouldStart, y) {
+        console.log(
+          `
+🚀 Starting development server on https://localhost:3000 ...
+`
+        );
+        const u = (e === "cloudflare-simple" || e === "cloudflare-multitenant") && w === "remote" ? `${l} run dev:remote` : `${l} run dev`;
+        await v(u, t);
+      }
+      s && !y && (console.log(`
+✅ Setup complete!`), console.log(`
+To start the development server:`), console.log(`  cd ${o}`), console.log((e === "cloudflare-simple" || e === "cloudflare-multitenant") && w === "remote" ? "  npm run dev:remote" : "  npm run dev"), (e === "cloudflare-simple" || e === "cloudflare-multitenant") && console.log(
+        `
+Server will be available at: https://localhost:3000`
+      ));
     } catch (p) {
       console.error(`
-❌ An error occurred:`, p);
+❌ An error occurred:`, p), process.exit(1);
     }
   }
-  h || (console.log("Next steps:"), console.log(`  cd ${t}`), a === "local" ? (console.log("  npm install"), console.log("  npm run migrate"), console.log("  npm run seed -- <email> <password>"), console.log("  npm run dev")) : (console.log("  npm install"), console.log("  npm run db:migrate"), console.log("  npm run seed"), console.log("  npm run dev")), console.log(`
+  h || (console.log("Next steps:"), console.log(`  cd ${o}`), e === "local" ? (console.log("  npm install"), console.log("  npm run migrate"), console.log(
+    "  ADMIN_EMAIL=admin@example.com ADMIN_PASSWORD=yourpassword npm run seed"
+  ), console.log("  npm run dev")) : (e === "cloudflare-simple" || e === "cloudflare-multitenant") && (console.log("  npm install"), console.log(
+    "  npm run migrate  # or npm run db:migrate:remote for production"
+  ), console.log(
+    "  ADMIN_EMAIL=admin@example.com ADMIN_PASSWORD=yourpassword npm run seed"
+  ), console.log("  npm run dev  # or npm run dev:remote for production"), console.log(`
+Server will be available at: https://localhost:3000`)), console.log(`
 For more information, visit: https://authhero.net/docs
 `));
 });
-w.parse(process.argv);
+D.parse(process.argv);

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.7.0",
+  "version": "0.9.0",
   "type": "module",
   "main": "dist/create-authhero.js",
   "bin": {