@fluixi/cli 0.1.0-alpha.82 → 0.1.0-alpha.83

package/dist/generate.mjs

@@ -1,15 +1,522 @@
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+// src/generate.ts
+import { writeFileSync as writeFileSync3, readFileSync as readFileSync3, existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
+import { resolve, dirname as dirname3, relative as relative3, basename } from "node:path";
+import { c as c3 } from "@fluixi/start/ui";
+
+// src/scaffold/auth.ts
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname as dirname2, join, relative } from "node:path";
+
+// src/scaffold/edit.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+function closing(text, open) {
+  let depth = 0;
+  for (let i = open; i < text.length; i++) {
+    const ch = text[i];
+    if (ch === "/" && text[i + 1] === "/") i = text.indexOf("\n", i) === -1 ? text.length : text.indexOf("\n", i);
+    else if (ch === "/" && text[i + 1] === "*") i = text.indexOf("*/", i + 2) + 1;
+    else if (ch === "'" || ch === '"' || ch === "`") {
+      for (i++; i < text.length && text[i] !== ch; i++) if (text[i] === "\\") i++;
+    } else if ("([{".includes(ch)) depth++;
+    else if (")]}".includes(ch) && --depth === 0) return i;
+  }
+  return -1;
+}
+function appendToArray(text, open, items) {
+  const close = closing(text, open);
+  const inner = text.slice(open + 1, close);
+  if (!inner.trim()) return text.slice(0, open + 1) + items.join(", ") + text.slice(close);
+  if (inner.includes("\n")) {
+    const last = inner.trimEnd();
+    const indent = last.slice(last.lastIndexOf("\n") + 1).match(/^\s*/)[0];
+    const comma = last.endsWith(",") ? "" : ",";
+    const tail = inner.slice(last.length);
+    return text.slice(0, open + 1) + last + comma + items.map((i) => `
+${indent}${i},`).join("") + tail + text.slice(close);
+  }
+  const body = inner.replace(/,?\s*$/, "");
+  const trailing = inner.slice(body.length).replace(/^,/, "");
+  return text.slice(0, open + 1) + body + ", " + items.join(", ") + trailing + text.slice(close);
+}
+function addImport(text, line) {
+  if (text.includes(line)) return text;
+  const imports = [...text.matchAll(/^import[\s\S]*?from\s+['"][^'"]+['"];?[^\n]*\n/gm)];
+  const at = imports.length ? imports[imports.length - 1].index + imports[imports.length - 1][0].length : 0;
+  return text.slice(0, at) + line + "\n" + text.slice(at);
+}
+function register(log, file, header, r) {
+  const imports = [...r.extraImports ?? [], r.importLine];
+  if (!existsSync(file)) {
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(
+      file,
+      `${header}import { defineApp } from '@fluixi/start/app';
+${imports.join("\n")}
+
+export default defineApp({ imports: [${r.entry}] });
+`
+    );
+    log.push({ kind: "created", file });
+    return true;
+  }
+  let text = readFileSync(file, "utf8");
+  if (text.includes(r.importLine)) {
+    log.push({ kind: "listed", file, detail: r.entry });
+    return true;
+  }
+  const m = text.match(/\bimports\s*:\s*\[/);
+  if (!m) {
+    log.push({ kind: "hint", file, lines: [...imports, `imports: [${r.entry}]`] });
+    return false;
+  }
+  text = appendToArray(text, m.index + m[0].length - 1, [r.entry]);
+  for (const line of imports) text = addImport(text, line);
+  writeFileSync(file, text);
+  log.push({ kind: "updated", file, detail: `imports ${r.entry}` });
+  return true;
+}
+function envPublicNames(configFile) {
+  if (!existsSync(configFile)) return null;
+  const text = readFileSync(configFile, "utf8");
+  const m = text.match(/\bpublic\s*:\s*\[/);
+  if (!m) return null;
+  const open = m.index + m[0].length - 1;
+  const list = text.slice(open, closing(text, open) + 1);
+  return [...list.matchAll(/['"]([A-Za-z_][A-Za-z0-9_]*)['"]/g)].map((x) => x[1]);
+}
+function addEnvPublic(log, configFile, names) {
+  const list = (indent) => `${indent}public: [
+${names.map((n) => `${indent}  '${n}',
+`).join("")}${indent}],
+`;
+  const have = envPublicNames(configFile);
+  if (have === null) {
+    const text2 = existsSync(configFile) ? readFileSync(configFile, "utf8") : "";
+    const call = text2.match(/defineConfig\(\{\n/);
+    if (call && !/\benv\s*:/.test(text2)) {
+      const at = call.index + call[0].length;
+      writeFileSync(configFile, text2.slice(0, at) + `  env: {
+${list("    ")}  },
+` + text2.slice(at));
+      log.push({ kind: "updated", file: configFile, detail: `env.public ${names.join(", ")}` });
+      return;
+    }
+    log.push({ kind: "hint", file: configFile, lines: [`env: { public: [${names.map((n) => `'${n}'`).join(", ")}] },`] });
+    return;
+  }
+  const missing = names.filter((n) => !have.includes(n));
+  if (!missing.length) return;
+  const text = readFileSync(configFile, "utf8");
+  const m = text.match(/\bpublic\s*:\s*\[/);
+  writeFileSync(configFile, appendToArray(text, m.index + m[0].length - 1, missing.map((n) => `'${n}'`)));
+  log.push({ kind: "updated", file: configFile, detail: `env.public + ${missing.join(", ")}` });
+}
+function addEnvExample(log, file, comment, vars) {
+  const text = existsSync(file) ? readFileSync(file, "utf8") : "";
+  const have = new Set([...text.matchAll(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=/gm)].map((m) => m[1]));
+  const add = Object.entries(vars).filter(([k]) => !have.has(k) && !have.has(`VITE_${k}`));
+  if (!add.length) return;
+  const block = `${comment.split("\n").map((l) => `# ${l}`).join("\n")}
+${add.map(([k, v]) => `${k}=${v}`).join("\n")}
+`;
+  writeFileSync(file, text ? `${text.replace(/\n*$/, "\n")}
+${block}` : block);
+  log.push({ kind: text ? "updated" : "created", file, detail: add.map(([k]) => k).join(", ") });
+}
+
+// src/scaffold/templates.ts
+var templates_exports = {};
+__export(templates_exports, {
+  AUTH_READER: () => AUTH_READER,
+  PROVIDERS: () => PROVIDERS,
+  PROVIDER_VARS: () => PROVIDER_VARS,
+  SERVER_ONLY: () => SERVER_ONLY,
+  apiRoute: () => apiRoute,
+  authEnvConfig: () => authEnvConfig,
+  authServerFile: () => authServerFile,
+  authServiceFile: () => authServiceFile,
+  betterAuthClient: () => betterAuthClient,
+  betterAuthConfig: () => betterAuthConfig,
+  betterAuthMiddleware: () => betterAuthMiddleware,
+  betterAuthRoute: () => betterAuthRoute,
+  callbackRoute: () => callbackRoute,
+  camel: () => camel,
+  envConfig: () => envConfig,
+  guardedApiRoute: () => guardedApiRoute,
+  loginRoute: () => loginRoute,
+  moduleFile: () => moduleFile,
+  serverFn: () => serverFn,
+  serviceFile: () => serviceFile,
+  verifyServer: () => verifyServer
+});
+var camel = (name) => name.toLowerCase().replace(/_+([a-z0-9])/g, (_, ch) => ch.toUpperCase());
+var envConfig = (names) => {
+  const fields = names.length ? names.map((n) => `  ${camel(n)}: '${n}',`).join("\n") : `  // apiUrl: 'API_URL',`;
+  return `import { pickEnv } from '@fluixi/start/env';
+
+// Every missing variable is reported at once, when this module loads. A field that may be
+// unset takes { key, optional: true } or { key, default }; parse: asNumber and friends convert.
+export const config = pickEnv({
+${fields}
+});
+`;
+};
+var moduleFile = (Name, name) => `import { defineModule } from '@fluixi/start/app';
+
+export const ${Name}Module = defineModule({
+  name: '${name}',
+  imports: [],
+  providers: [],
+});
+`;
+var serviceFile = (Name, name, server) => `${server ? `// Server only: the browser build refuses a page that imports this file.
+` : ""}import { injectionToken } from '@fluixi/start/di';
+import { defineModule } from '@fluixi/start/app';
+
+export class ${Name}Service {}
+
+export const ${Name}Token = injectionToken<${Name}Service>('${Name}');
+
+export const ${Name}Module = defineModule({
+  name: '${name}',
+  providers: [{ provide: ${Name}Token, useFactory: () => new ${Name}Service() }],
+});
+`;
+var apiRoute = () => `export function GET(request: Request) {
+  return Response.json({ path: new URL(request.url).pathname });
+}
+`;
+var guardedApiRoute = (guardImport, role) => `import { guard } from '${guardImport}';
+
+export const GET = guard(
+  async (request, claims) => {
+    return Response.json({ sub: claims.sub });
+  },
+  { role: '${role}' },
+);
+`;
+var verifyServer = () => `import { createTokenVerifier, createApiGuard } from '@fluixi/oauth2/verify';
+import { auth } from '../config/env.js';
+
+// Checks a bearer token's signature, issuer, audience and expiry against the provider.
+export const verify = createTokenVerifier(auth.provider.verifier(auth.clientId));
+
+// Answers 401 without a valid token and 403 without the role.
+export const guard = createApiGuard({ verify, roles: auth.provider.roles });
+`;
+var serverFn = (name) => `export async function ${name}(input: { id: string }) {
+  'use server';
+  // Runs on the server only. The browser calls it over RPC, so input and result are plain data.
+  return { id: input.id };
+}
+`;
+var PROVIDERS = ["oidc", "keycloak", "auth0", "okta", "google", "dex", "oauth2"];
+var SERVER_ONLY = {
+  google: "Google answers a token request without a client secret with `client_secret is missing`",
+  dex: "Dex sends no CORS headers on discovery or the token endpoint"
+};
+var PROVIDER_VARS = {
+  oidc: { AUTH_ISSUER: "https://id.example.com" },
+  keycloak: { AUTH_BASE_URL: "http://localhost:8080", AUTH_REALM: "master" },
+  auth0: { AUTH_DOMAIN: "example.eu.auth0.com", AUTH_AUDIENCE: "https://api.example.com" },
+  okta: { AUTH_DOMAIN: "example.okta.com" },
+  google: {},
+  dex: { AUTH_BASE_URL: "http://localhost:5556/dex" },
+  oauth2: {
+    AUTH_ISSUER: "https://id.example.com",
+    AUTH_AUTHORIZATION_ENDPOINT: "https://id.example.com/authorize",
+    AUTH_TOKEN_ENDPOINT: "https://id.example.com/token"
+  }
+};
+var AUTH_READER = `// Provider, issuer, client and token mode from the AUTH_* variables in env.public. Moving to
+// another provider is a change to .env.
+export const auth = authFromEnv(publicEnv(), { clientPrefix: '' });
+`;
+var authEnvConfig = () => `import { publicEnv } from '@fluixi/start/env';
+import { authFromEnv } from '@fluixi/oauth2/env';
+
+${AUTH_READER}`;
+var authServiceFile = (tokens) => `import { createAuthService, authModule } from '@fluixi/oauth2';
+import { env } from '@fluixi/start/env';
+${tokens === "browser" ? `import { auth as authEnv } from '../config/env.js';
+` : ""}
+export interface User {
+  sub: string;
+  email?: string;
+  name?: string;
+}
+
+const appUrl = env('APP_URL') ?? 'http://localhost:3000';
+
+export const auth = createAuthService<User>({
+${tokens === "browser" ? `  config: {
+    ...authEnv.client,
+    tokens: 'browser',
+    redirectUri: \`\${appUrl}/callback\`,
+    postLogoutRedirectUri: \`\${appUrl}/login\`,
+  },` : `  // The tokens stay on the server behind an httpOnly cookie. The browser calls the routes
+  // auth.server.ts mounts under basePath and never sees a token.
+  config: {
+    tokens: 'server',
+    redirectUri: \`\${appUrl}/auth/callback\`,
+    postLogoutRedirectUri: \`\${appUrl}/login\`,
+    basePath: '/auth',
+  },`}
+});
+
+export const AuthModule = authModule(auth);
+export const { protectedRoute, Protect, Can, useUser } = auth;
+`;
+var authServerFile = () => `import { authServerModule } from '@fluixi/oauth2/server';
+import { publicEnv, serverEnv } from '@fluixi/start/env';
+import { auth } from '../config/env.js';
+
+// A function: serverEnv with required throws when a secret is unset, and it is only read
+// when app.config.server.ts registers this.
+export function authServer() {
+  const appUrl = publicEnv().APP_URL ?? 'http://localhost:3000';
+  return authServerModule({
+    ...auth.client,
+    clientSecret: serverEnv('OIDC_CLIENT_SECRET', { required: true }),
+    cookieSecret: serverEnv('SESSION_SECRET', { required: true }),
+    redirectUri: \`\${appUrl}/auth/callback\`,
+    defaultReturnTo: '/',
+    secureCookie: appUrl.startsWith('https://'),
+  });
+}
+`;
+var callbackRoute = (html) => html ? `import { html } from '@fluixi/core';
+import { OAuthCallback } from '@fluixi/oauth2/callback';
+
+export default OAuthCallback({
+  pending: () => html\`<p>Signing you in</p>\`,
+  failed: (reason) => html\`<p>\${reason}</p><a href="/login">Try again</a>\`,
+});
+` : `import { OAuthCallback } from '@fluixi/oauth2/callback';
+
+export default OAuthCallback({
+  pending: () => <p>Signing you in</p>,
+  failed: (reason) => (
+    <>
+      <p>{reason}</p>
+      <a href="/login">Try again</a>
+    </>
+  ),
+});
+`;
+var loginRoute = (html) => html ? `import { html } from '@fluixi/core';
+import { auth } from '../services/auth.js';
+
+export default function Login() {
+  return html\`<button @click=\${() => auth.signIn({ returnTo: '/' })}>Sign in</button>\`;
+}
+` : `import { auth } from '../services/auth.js';
+
+export default function Login() {
+  return <button onClick={() => auth.signIn({ returnTo: '/' })}>Sign in</button>;
+}
+`;
+var betterAuthConfig = () => `import { betterAuth } from 'better-auth';
+import { defineAuth } from '@fluixi/auth/server';
+
+export type AppUser = { id: string; email: string; name?: string; role?: string };
+
+// Better Auth owns the audited primitives; defineAuth registers it with @fluixi/auth.
+export const auth = defineAuth<AppUser>(
+  betterAuth({
+    // database: <your adapter>,
+    emailAndPassword: { enabled: true },
+    // socialProviders: { google: { … }, github: { … } },
+  } as Parameters<typeof betterAuth>[0]),
+);
+`;
+var betterAuthClient = () => `import { createAuthClient } from 'better-auth/client';
+import { createAuthHooks } from '@fluixi/auth/client';
+import type { AppUser } from './auth.config.js';
+
+const client = createAuthClient({ baseURL: '/api/auth' });
+
+// Or, to reuse an existing reactive session: createAuthHooks({ session: yourSessionStore }).
+export const { useUser, useSession, useAuth, useSignIn, useSignOut, protectedRoute } =
+  createAuthHooks<AppUser>({ client, loginPath: '/login' });
+`;
+var betterAuthMiddleware = () => `import { defineMiddleware } from '@fluixi/start';
+import { authMiddleware } from '@fluixi/auth/server';
+import './auth.config.js';
+
+export default defineMiddleware([authMiddleware()]);
+`;
+var betterAuthRoute = () => `import { mountAuthRoutes } from '@fluixi/auth/server';
+import '../../auth.config.js';
+
+const handler = mountAuthRoutes();
+export const GET = handler;
+export const POST = handler;
+export default handler;
+`;
+
+// src/scaffold/auth.ts
+var ScaffoldError = class extends Error {
+};
+function importPath(from, to) {
+  const p = relative(dirname2(from), to).replace(/\\/g, "/").replace(/\.tsx?$/, ".js");
+  return p.startsWith(".") ? p : `./${p}`;
+}
+function writeOnce(log, file, content) {
+  if (existsSync2(file)) {
+    log.push({ kind: "kept", file });
+    return false;
+  }
+  mkdirSync2(dirname2(file), { recursive: true });
+  writeFileSync2(file, content);
+  log.push({ kind: "created", file });
+  return true;
+}
+var APP_HEADER = "// Registered by @fluixi/start ahead of both entries.\n";
+var APP_SERVER_HEADER = "// Only the server build imports this file, so what it lists never reaches the browser.\n";
+function registerModule(log, root, server, file, name, entry = name) {
+  const config = join(root, server ? "src/app.config.server.ts" : "src/app.config.ts");
+  register(log, config, server ? APP_SERVER_HEADER : APP_HEADER, {
+    importLine: `import { ${name} } from '${importPath(config, file)}';`,
+    entry
+  });
+}
+function ensureAuthEnv(log, root) {
+  const file = join(root, "src/config/env.ts");
+  if (writeOnce(log, file, authEnvConfig())) return;
+  let text = readFileSync2(file, "utf8");
+  if (/export\s+const\s+auth\b/.test(text)) return;
+  if (!/\bpublicEnv\b/.test(text)) text = addImport(text, `import { publicEnv } from '@fluixi/start/env';`);
+  text = addImport(text, `import { authFromEnv } from '@fluixi/oauth2/env';`);
+  writeFileSync2(file, `${text.replace(/\n*$/, "\n")}
+${AUTH_READER}`);
+  log.push({ kind: "updated", file, detail: "auth" });
+}
+function resolveTokens(provider, tokens) {
+  const refusal = SERVER_ONLY[provider];
+  if (refusal && tokens === "browser") throw new ScaffoldError(`${provider} needs server tokens: ${refusal}`);
+  return { tokens: tokens ?? (refusal ? "server" : "browser"), forced: !!refusal && !tokens };
+}
+function setupOAuth2(root, options, dependencySpec = "alpha") {
+  const provider = options.provider ?? "oidc";
+  if (!PROVIDERS.includes(provider)) throw new ScaffoldError(`unknown provider ${provider}: ${PROVIDERS.join(", ")}`);
+  const { tokens, forced } = resolveTokens(provider, options.tokens);
+  const html = options.format === "html";
+  const ext = html ? "ts" : "tsx";
+  const steps = [];
+  const at = (rel2) => join(root, rel2);
+  ensureAuthEnv(steps, root);
+  const service = at("src/services/auth.ts");
+  if (writeOnce(steps, service, authServiceFile(tokens))) registerModule(steps, root, false, service, "AuthModule");
+  if (tokens === "browser") writeOnce(steps, at(`src/routes/callback.${ext}`), callbackRoute(html));
+  writeOnce(steps, at(`src/routes/login.${ext}`), loginRoute(html));
+  if (tokens === "server") {
+    const server = at("src/services/auth.server.ts");
+    if (writeOnce(steps, server, authServerFile())) registerModule(steps, root, true, server, "authServer", "authServer()");
+  }
+  const vars = {
+    AUTH_PROVIDER: provider,
+    AUTH_CLIENT_ID: "my-app",
+    AUTH_TOKENS: tokens,
+    ...PROVIDER_VARS[provider],
+    APP_URL: "http://localhost:3000"
+  };
+  addEnvPublic(steps, at("fluixi.config.ts"), Object.keys(vars));
+  addEnvExample(steps, at(".env.example"), `@fluixi/oauth2 (${provider}). Listed in env.public: the browser sees them.`, vars);
+  if (tokens === "server") {
+    addEnvExample(steps, at(".env.example"), "Server only, never in env.public. SESSION_SECRET: 32 bytes or more.", {
+      OIDC_CLIENT_SECRET: "",
+      SESSION_SECRET: ""
+    });
+  }
+  const redirect = tokens === "browser" ? "/callback" : "/auth/callback";
+  return {
+    steps,
+    dependencies: { "@fluixi/oauth2": dependencySpec },
+    next: ["copy .env.example to .env and fill it in", `register <APP_URL>${redirect} as the redirect URI at the provider`],
+    notes: forced ? [`${provider} refuses a public client, so the tokens stay on the server`] : []
+  };
+}
+function setupBetterAuth(root, dependencySpec = "alpha") {
+  const steps = [];
+  const at = (rel2) => join(root, rel2);
+  writeOnce(steps, at("src/auth.config.ts"), betterAuthConfig());
+  writeOnce(steps, at("src/auth.client.ts"), betterAuthClient());
+  if (!writeOnce(steps, at("src/middleware.ts"), betterAuthMiddleware())) {
+    steps.push({
+      kind: "hint",
+      file: at("src/middleware.ts"),
+      lines: [`import { authMiddleware } from '@fluixi/auth/server';`, `import './auth.config.js';`, "authMiddleware() in the middleware list"]
+    });
+  }
+  writeOnce(steps, at("src/api/auth/[...all].ts"), betterAuthRoute());
+  return {
+    steps,
+    dependencies: { "@fluixi/auth": dependencySpec, "better-auth": "^1" },
+    next: ["set your database adapter in src/auth.config.ts"],
+    notes: []
+  };
+}
+
+// src/scaffold/prompt.ts
+import { createInterface } from "node:readline/promises";
+import { stdin as input, stdout as output, exit, env } from "node:process";
+var COLOR = env.NO_COLOR || env.FORCE_COLOR === "0" ? false : (!!output.isTTY || !!env.FORCE_COLOR) && env.TERM !== "dumb";
+var sgr = (o, x) => (s) => COLOR ? `\x1B[${o}m${s}\x1B[${x}m` : `${s}`;
+var c = { bold: sgr(1, 22), green: sgr(32, 39), cyan: sgr(36, 39), gray: sgr(90, 39) };
+var BAR = c.gray("│");
+
+// src/report.ts
+import { relative as relative2 } from "node:path";
+import { c as c2 } from "@fluixi/start/ui";
+var rel = (file) => relative2(process.cwd(), file) || ".";
+function report(steps) {
+  for (const s of steps) {
+    if (s.kind === "hint") {
+      console.log(`  ${c2.yellow("!")} ${c2.gray("add to")} ${c2.cyan(rel(s.file))}${c2.gray(":")}`);
+      for (const l of s.lines) console.log(`    ${l}`);
+    } else if (s.kind === "kept") {
+      console.log(`  ${c2.gray("-")} ${c2.cyan(rel(s.file))} ${c2.gray("exists, kept")}`);
+    } else if (s.kind === "listed") {
+      console.log(`  ${c2.gray("-")} ${c2.cyan(rel(s.file))} ${c2.gray("already lists it")}`);
+    } else {
+      console.log(`  ${c2.green("✓")} ${c2.gray(s.kind)} ${c2.cyan(rel(s.file))}${s.detail ? c2.gray(`: ${s.detail}`) : ""}`);
+    }
+  }
+}
+function reportAuth(result, installHint) {
+  for (const n of result.notes) console.log(`  ${c2.gray(n)}`);
+  report(result.steps);
+  const next = [...installHint ? [installHint] : [], ...result.next];
+  if (next.length) console.log(`  ${c2.gray("next:")} ${next.map((n) => c2.gray(n)).join(c2.gray("; "))}`);
+}
+
 // src/generate.ts
-import { writeFileSync, readFileSync, existsSync, mkdirSync } from "node:fs";
-import { resolve, dirname, relative, basename } from "node:path";
-import { c } from "@fluixi/start/ui";
-var GEN_USAGE = `Usage: fluixi generate <kind> <name>
+var GEN_USAGE = `Usage: fluixi generate <kind> [name] [options]
 
 Kinds:
-  component <Name>      a reusable component        → src/components/<Name>.{tsx,ts}
-  route <path>          a file-based route page     → src/routes/<path>.{tsx,ts}
-  middleware            the request middleware file → src/middleware.ts
-  auth                  @fluixi/auth wiring         → auth.config + auth.client + middleware + /api/auth route
+  component <Name>            a reusable component         → src/components/<Name>.{tsx,ts}
+  route <path>                a file-based route page      → src/routes/<path>.{tsx,ts}
+  middleware                  the request middleware file  → src/middleware.ts
+  env                         typed config from env.public → src/config/env.ts
+  module <name>               an app module                → src/services/<name>/<name>.module.ts
+  service <Name> [--server]   a service, token and module  → src/services/<name>.ts (.server.ts)
+  api <path> [--role <role>]  an API route, guarded by role → src/api/<path>.ts
+  server-fn <name>            a "use server" function      → src/server/<name>.ts
+  auth oauth2 [--provider <p>] [--tokens browser|server]
+                              @fluixi/oauth2 wiring: env config, service, routes, .env.example
+                              (fluixi add auth does the same, asks, and installs)
+  auth better-auth            @fluixi/auth wiring          → auth.config + auth.client + middleware + /api/auth
 
+Modules and services are listed in src/app.config.ts, or app.config.server.ts for --server,
+which is created when missing. Providers: ${templates_exports.PROVIDERS.join(", ")}.
 Component/route syntax follows the project (JSX → .tsx, html\`\` → .ts); override with --jsx / --html.
 `;
 function detectFormat() {
@@ -17,7 +524,7 @@ function detectFormat() {
   if (args.includes("--html")) return "html";
   if (args.includes("--jsx")) return "jsx";
   try {
-    const ts = JSON.parse(readFileSync(resolve("tsconfig.json"), "utf8"));
+    const ts = JSON.parse(readFileSync3(resolve("tsconfig.json"), "utf8"));
     if (ts?.compilerOptions && !ts.compilerOptions.jsx) return "html";
   } catch {
   }
@@ -28,28 +535,46 @@ function pascal(s) {
 }
 function resolveHint(Name, ext) {
   const configs = ["vite.config.ts", "vite.config.js", "fluixi.config.ts", "fluixi.config.js"];
-  const found = configs.map((f) => resolve(f)).find((f) => existsSync(f));
+  const found = configs.map((f) => resolve(f)).find((f) => existsSync3(f));
   if (!found) return;
   try {
-    if (/\bresolve\s*:\s*\[/.test(readFileSync(found, "utf8"))) return;
+    if (/\bresolve\s*:\s*\[/.test(readFileSync3(found, "utf8"))) return;
   } catch {
     return;
   }
   console.log(
-    `  ${c.gray("to use")} ${c.cyan(`<${Name} />`)} ${c.gray("without importing it, add to")} ${c.cyan(relative(process.cwd(), found))}:`
+    `  ${c3.gray("to use")} ${c3.cyan(`<${Name} />`)} ${c3.gray("without importing it, add to")} ${c3.cyan(relative3(process.cwd(), found))}:`
   );
-  console.log(`    ${c.gray(`resolve: [{ match: /^([A-Z]\\w+)$/, module: '/src/components/$1.${ext}' }]`)}`);
-  console.log(`  ${c.gray("one pattern covers the whole folder. Importing it works too — including with")} ${c.cyan("load:")}`);
+  console.log(`    ${c3.gray(`resolve: [{ match: /^([A-Z]\\w+)$/, module: '/src/components/$1.${ext}' }]`)}`);
+  console.log(`  ${c3.gray("one pattern covers the whole folder. Importing it works too — including with")} ${c3.cyan("load:")}`);
+}
+function option(name) {
+  const args = process.argv;
+  const i = args.indexOf(`--${name}`);
+  if (i !== -1 && args[i + 1] && !args[i + 1].startsWith("--")) return args[i + 1];
+  return args.find((a) => a.startsWith(`--${name}=`))?.slice(name.length + 3);
+}
+var kebab = (s) => s.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
+function writeOnce2(file, content) {
+  const steps = [];
+  const wrote = writeOnce(steps, file, content);
+  report(steps);
+  return wrote;
+}
+function registerIn(server, file, name, entry = name) {
+  const steps = [];
+  registerModule(steps, process.cwd(), server, file, name, entry);
+  report(steps);
 }
 function write(file, content) {
-  const rel = relative(process.cwd(), file);
-  if (existsSync(file)) {
-    console.error(`  ${c.red("✗")} ${rel} ${c.gray("already exists")}`);
+  const rel2 = relative3(process.cwd(), file);
+  if (existsSync3(file)) {
+    console.error(`  ${c3.red("✗")} ${rel2} ${c3.gray("already exists")}`);
     process.exit(1);
   }
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, content);
-  console.log(`  ${c.green("✓")} ${c.gray("created")} ${c.cyan(rel)}`);
+  mkdirSync3(dirname3(file), { recursive: true });
+  writeFileSync3(file, content);
+  console.log(`  ${c3.green("✓")} ${c3.gray("created")} ${c3.cyan(rel2)}`);
 }
 var component = (Name) => `import type { Component, ComponentChild } from '@fluixi/core';
 
@@ -103,44 +628,6 @@ export default defineMiddleware([
   },
 ]);
 `;
-var authConfig = () => `import { betterAuth } from 'better-auth';
-import { defineAuth } from '@fluixi/auth/server';
-
-export type AppUser = { id: string; email: string; name?: string; role?: string };
-
-// Better Auth owns the audited primitives; defineAuth registers it with @fluixi/auth.
-export const auth = defineAuth<AppUser>(
-  betterAuth({
-    // database: <your adapter>,
-    emailAndPassword: { enabled: true },
-    // socialProviders: { google: { … }, github: { … } },
-  } as Parameters<typeof betterAuth>[0]),
-);
-`;
-var authClient = () => `import { createAuthClient } from 'better-auth/client';
-import { createAuthHooks } from '@fluixi/auth/client';
-import type { AppUser } from './auth.config.js';
-
-const client = createAuthClient({ baseURL: '/api/auth' });
-
-// Or, to reuse an existing reactive session: createAuthHooks({ session: yourSessionStore }).
-export const { useUser, useSession, useAuth, useSignIn, useSignOut, protectedRoute } =
-  createAuthHooks<AppUser>({ client, loginPath: '/login' });
-`;
-var authMiddleware = () => `import { defineMiddleware } from '@fluixi/start';
-import { authMiddleware } from '@fluixi/auth/server';
-import './auth.config.js';
-
-export default defineMiddleware([authMiddleware()]);
-`;
-var authRoute = () => `import { mountAuthRoutes } from '@fluixi/auth/server';
-import '../../../auth.config.js';
-
-const handler = mountAuthRoutes();
-export const GET = handler;
-export const POST = handler;
-export default handler;
-`;
 function generate(kind, name) {
   switch (kind) {
     case "component":
@@ -165,20 +652,88 @@ function generate(kind, name) {
     case "m":
       write(resolve("src/middleware.ts"), middleware());
       break;
+    case "env": {
+      const names = (envPublicNames(resolve("fluixi.config.ts")) ?? []).filter((n) => !n.startsWith("AUTH_"));
+      write(resolve("src/config/env.ts"), templates_exports.envConfig(names));
+      break;
+    }
+    case "module": {
+      if (!name) return fail("module name required, e.g. `fluixi g module billing`");
+      const slug = kebab(name);
+      const file = resolve("src/services", slug, `${slug}.module.ts`);
+      write(file, templates_exports.moduleFile(pascal(name), slug));
+      registerIn(false, file, `${pascal(name)}Module`);
+      break;
+    }
+    case "service":
+    case "s": {
+      if (!name) return fail("service name required, e.g. `fluixi g service Orders`");
+      const Name = pascal(name).replace(/Service$/, "") || "App";
+      const server = process.argv.includes("--server");
+      const file = resolve("src/services", `${kebab(Name)}${server ? ".server" : ""}.ts`);
+      write(file, templates_exports.serviceFile(Name, kebab(Name), server));
+      registerIn(server, file, `${Name}Module`);
+      break;
+    }
+    case "api": {
+      if (!name) return fail("api path required, e.g. `fluixi g api users/[id]`");
+      const file = resolve("src/api", `${name.replace(/\.ts$/, "")}.ts`);
+      const role = option("role");
+      if (!role) {
+        write(file, templates_exports.apiRoute());
+        break;
+      }
+      const verify = resolve("src/services/verify.server.ts");
+      write(file, templates_exports.guardedApiRoute(importPath(file, verify), role));
+      writeOnce2(verify, templates_exports.verifyServer());
+      {
+        const steps = [];
+        ensureAuthEnv(steps, process.cwd());
+        report(steps);
+      }
+      break;
+    }
+    case "server-fn": {
+      if (!name) return fail("function name required, e.g. `fluixi g server-fn getUser`");
+      const fn = name.replace(/[^a-zA-Z0-9]+(.)/g, (_, ch) => ch.toUpperCase());
+      write(resolve("src/server", `${fn}.ts`), templates_exports.serverFn(fn));
+      break;
+    }
     case "auth":
-      write(resolve("src/auth.config.ts"), authConfig());
-      write(resolve("src/auth.client.ts"), authClient());
-      write(resolve("src/middleware.ts"), authMiddleware());
-      write(resolve("src/routes/api/auth/[...all].ts"), authRoute());
-      console.log(`  ${c.gray("next: install")} ${c.cyan("better-auth")}${c.gray(", set your DB adapter in auth.config.ts, and forward `request` in entry-server")}`);
+      try {
+        if (name === "oauth2") {
+          reportAuth(
+            setupOAuth2(process.cwd(), {
+              provider: option("provider"),
+              tokens: tokensOption(),
+              format: detectFormat()
+            }),
+            "install @fluixi/oauth2"
+          );
+        } else if (!name || name === "better-auth") {
+          reportAuth(setupBetterAuth(process.cwd()), "install @fluixi/auth and better-auth");
+        } else {
+          return fail(`unknown auth kind ${name}: oauth2 or better-auth`);
+        }
+      } catch (error) {
+        if (error instanceof ScaffoldError) return fail(error.message);
+        throw error;
+      }
       break;
     default:
       console.error(GEN_USAGE);
       process.exit(1);
   }
 }
+function tokensOption() {
+  const tokens = option("tokens");
+  if (tokens !== void 0 && tokens !== "browser" && tokens !== "server") {
+    fail("--tokens is browser or server");
+  }
+  return tokens;
+}
 function fail(msg) {
-  console.error(`  ${c.red("✗")} ${msg}`);
+  console.error(`  ${c3.red("✗")} ${msg}`);
   process.exit(1);
 }
 export {