create-astroid 0.2.0 → 0.3.1

package/index.mjs

@@ -173,8 +173,23 @@ function astroidConfigSource(config) {
     ...(config.modules?.length ? [`  modules: ${JSON.stringify(config.modules)},`] : []),
     // Must be emitted: `astroid generate` rebuilds the middleware from THIS
     // file, so a config that omitted the portal would regenerate a middleware
-    // with no guard while src/portal-auth.ts sat there unused.
-    ...(config.portal?.enabled ? ["  portal: { enabled: true },"] : []),
+    // with no guard while src/portal-auth.ts sat there unused. And the FULL shape
+    // (tablePrefix, signUp) — not a bare `{ enabled: true }` — so a regenerate
+    // reproduces the SAME unprefixed `user`/`session` seam the 0002_portal_auth
+    // migration created, rather than defaulting the prefix back to `portal_`.
+    ...(config.portal?.enabled
+      ? [
+          "  portal: {",
+          "    enabled: true,",
+          ...(config.portal.tablePrefix !== undefined
+            ? [`    tablePrefix: ${JSON.stringify(config.portal.tablePrefix)},`]
+            : []),
+          ...(config.portal.signUp !== undefined
+            ? [`    signUp: ${JSON.stringify(config.portal.signUp)},`]
+            : []),
+          "  },",
+        ]
+      : []),
     '  deploy: { platform: "cloudflare" },',
     "});",
     "",
@@ -243,9 +258,11 @@ async function main() {
   const archetype = ARCHETYPES.includes(archetypeRaw) ? archetypeRaw : "marketing";
   const color = flags.color || (await prompt("Brand color (hex)", "#5b4bff"));
   const host = flags.host && flags.host !== true ? flags.host : undefined;
-  // Portal + commerce are opt-in and unprompted: each pulls in real
-  // infrastructure a plain marketing site should not carry.
-  const portal = flags.portal === true || flags.portal === "true";
+  // The customer PORTAL is opt-in via --portal, but a storefront IMPLIES one — a
+  // shop has customers who sign in, reorder, and track orders — so enable it there
+  // by default. (Commerce below stays opt-in: infra a marketing site shouldn't carry.)
+  const portal =
+    flags.portal === true || flags.portal === "true" || archetype === "storefront";
   // The map module is opt-in and pulls real weight (maplibre-gl is ~1 MB), so
   // it is never on by default.
   const map = flags.map === true || flags.map === "true";
@@ -284,7 +301,10 @@ async function main() {
     theme: { name, colors: { brand: color } },
     sections: ARCHETYPE_SECTIONS[archetype],
     ...(commerce ? { commerce: { provider: commerce } } : {}),
-    ...(portal ? { portal: { enabled: true } } : {}),
+    // Unprefixed `user`/`session` (customers — email + password), so the studio's
+    // `louise_`-prefixed tables and the portal's never collide (mirrors the
+    // reference storefront). `signUp: true` because a shop lets customers register.
+    ...(portal ? { portal: { enabled: true, tablePrefix: "", signUp: true } } : {}),
     // ONE array, built from every enabled flag. Two separate `...(x ? {modules}
     // : {})` spreads would let the later one overwrite the earlier, silently
     // dropping a module whenever both were passed.
@@ -389,16 +409,22 @@ async function main() {
   let authMigrationOk = false;
   try {
     const { generateAuthSchemaSql } = await import("louise-toolkit/auth");
-    write(dir, "migrations/0001_auth.sql", generateAuthSchemaSql());
-    // The portal's own auth tables. A SECOND set, prefixed — the two instances
-    // share one D1 but never a row, so a portal account can't sign into the
-    // studio and an editor doesn't appear in the portal. Without this migration
-    // the portal builds fine and fails on the first sign-in.
+    // The EDITOR instance's tables — `louise_`-prefixed (the editor convention),
+    // leaving the unprefixed `user`/`session` names free for a second/portal
+    // instance. Must match the `tablePrefix` in src/auth.ts and the `louise_user`
+    // table the generated `editorsRoute` reads.
+    write(dir, "migrations/0001_auth.sql", generateAuthSchemaSql({ tablePrefix: "louise_" }));
+    // The portal's own auth tables — a SECOND Better Auth instance sharing one D1
+    // but never a row, so a portal account can't sign into the studio and an
+    // editor doesn't appear in the portal. `customers: true` (email + password)
+    // and the config's tablePrefix, so this schema matches the scaffolded
+    // portal-auth.ts exactly. Without this migration the portal builds fine and
+    // fails on the first sign-in with a missing table.
     if (config.portal?.enabled) {
       write(
         dir,
         "migrations/0002_portal_auth.sql",
-        generateAuthSchemaSql({ tablePrefix: "portal_" }),
+        generateAuthSchemaSql({ customers: true, tablePrefix: config.portal.tablePrefix ?? "" }),
       );
     }
     authMigrationOk = true;
@@ -406,7 +432,7 @@ async function main() {
     write(
       dir,
       "migrations/0001_auth.sql",
-      "-- Better Auth tables — generate after install:\n--   pnpm exec louise gen-auth-schema --out migrations/0001_auth.sql\n",
+      "-- Better Auth tables (editor, louise_ prefix) — generate after install:\n--   pnpm exec louise gen-auth-schema --table-prefix louise_ --out migrations/0001_auth.sql\n",
     );
     // Same stub for the portal's prefixed set. Without it a portal scaffold
     // looks complete, builds, and fails on the first sign-in with a missing
@@ -415,8 +441,8 @@ async function main() {
       write(
         dir,
         "migrations/0002_portal_auth.sql",
-        "-- Portal Better Auth tables (prefixed) — generate after install:\n" +
-          "--   pnpm exec louise gen-auth-schema --table-prefix portal_ --out migrations/0002_portal_auth.sql\n",
+        "-- Portal Better Auth tables (customers, unprefixed) — generate after install:\n" +
+          "--   pnpm exec louise gen-auth-schema --out migrations/0002_portal_auth.sql\n",
       );
     }
   }
@@ -441,7 +467,7 @@ async function main() {
         : [
             "  # generate the Better Auth migration (it could not be written at scaffold",
             "  # time — `louise` is on your path once the install above finishes):",
-            "  pnpm exec louise gen-auth-schema --out migrations/0001_auth.sql",
+            "  pnpm exec louise gen-auth-schema --table-prefix louise_ --out migrations/0001_auth.sql",
             ...(config.portal?.enabled
               ? [
                   "  pnpm exec louise gen-auth-schema --table-prefix portal_ \\",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astroid",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Scaffold a new Astroid site — an editable, multi-editor Astro app on Cloudflare Workers — in one command.",
   "keywords": [
     "astro",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@better-auth/passkey": "^1.6.23",
     "better-auth": "^1.6.23",
-    "astroidjs": "0.2.0",
-    "louise-toolkit": "0.16.0"
+    "astroidjs": "0.3.1",
+    "louise-toolkit": "0.17.1"
   },
   "engines": {
     "node": ">=24.0.0"

package/template/scripts/seed-editors.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// Seed the first editor(s) — an admin `user` row per OWNER_EMAIL / ENGINEER_EMAIL.
+// Seed the first editor(s) — an admin `louise_user` row per OWNER_EMAIL / ENGINEER_EMAIL.
 // A row here IS an editor and IS the magic-link allowlist, so this bootstraps
 // access before anyone can sign in. Idempotent (INSERT OR IGNORE on unique email).
 // After this, add more editors from the Users panel (never by editing env).
@@ -46,7 +46,7 @@ for (const email of emails) {
   const id = randomUUID();
   const name = email.split("@")[0];
   const sql =
-    "INSERT OR IGNORE INTO user " +
+    "INSERT OR IGNORE INTO louise_user " +
     "(id, name, email, emailVerified, createdAt, updatedAt, role, firstName, lastName) VALUES " +
     `(${q(id)}, ${q(name)}, ${q(email)}, 1, ${q(now)}, ${q(now)}, 'admin', NULL, NULL);`;
   console.log(`Seeding editor ${email} (${target}) …`);

package/template/src/auth.ts

@@ -1,11 +1,14 @@
 // The auth seam Astroid's generated worker.ts + middleware.ts import
 // (`resolveEditor`), plus the Better Auth catch-all the /api/auth route calls.
 //
-// DB-managed editors: an admin `user` row IS an editor. That table is BOTH the
-// role source and the magic-link allowlist — `resolveAdmins` reads it, so only an
-// existing editor's email can request a sign-in link. Seed the first editor with
-// `pnpm seed:editors`; add more from the Users panel (editorsRoute), never by
-// editing env. Magic-link + passkey come from `getLouiseAuth`; no passwords.
+// DB-managed editors: an admin `louise_user` row IS an editor. The editor
+// instance's tables are `louise_`-prefixed (the editor convention), leaving the
+// unprefixed `user`/`session` names free for a second/portal instance. That
+// table is BOTH the role source and the magic-link allowlist — `resolveAdmins`
+// reads it, so only an existing editor's email can request a sign-in link. Seed
+// the first editor with `pnpm seed:editors`; add more from the Users panel
+// (editorsRoute), never by editing env. Magic-link + passkey come from
+// `getLouiseAuth`; no passwords.
 
 import { astroidMailTheme, magicLinkEmail } from "astroidjs";
 import { env } from "cloudflare:workers";
@@ -26,10 +29,10 @@ const BRAND = "__BRAND_NAME__";
 // second argument to override any slot.
 const MAIL_THEME = astroidMailTheme(astroidConfig);
 
-/** The DB-managed editor allowlist: every admin `user` row. */
+/** The DB-managed editor allowlist: every admin `louise_user` row. */
 async function resolveAdmins(): Promise<string[]> {
   const { results } = await env.DB.prepare(
-    "SELECT email FROM user WHERE role = 'admin'",
+    "SELECT email FROM louise_user WHERE role = 'admin'",
   ).all<{ email: string }>();
   return results.map((r) => r.email);
 }
@@ -39,13 +42,16 @@ function renderMagicLinkEmail({ url, toEmail }: { url: string; toEmail: string }
   return magicLinkEmail(MAIL_THEME, { url, toEmail });
 }
 
-/** The request-scoped Better Auth instance (magic-link + passkey, DB allowlist). */
+/** The request-scoped Better Auth instance (magic-link + passkey, DB allowlist).
+ *  `tablePrefix: "louise_"` namespaces the editor's Better Auth tables so a
+ *  second (portal) instance can take the unprefixed `user`/`session` names. */
 function getAuth(request: Request): Promise<LouiseAuth> {
   return getLouiseAuth(env, new URL(request.url).origin, {
     rpName: BRAND,
     mailFrom: { email: env.MAIL_FROM, name: BRAND },
     renderMagicLinkEmail,
     resolveAdmins,
+    tablePrefix: "louise_",
   });
 }