toiljs 0.0.104 → 0.0.106

package/src/compiler/emails.ts

@@ -63,6 +63,15 @@ const REACT_INTERNAL = new Set([
     'then', // so a thenable check never tokenizes
 ]);
 
+/**
+ * Reserved `emails/*.tsx` module names (by PascalCase basename) that OVERRIDE a
+ * built-in auth email instead of becoming a generic `Emails.<Name>.send(...)`
+ * entry. When one is present, the auth pipeline (src/compiler/auth-emails.ts)
+ * bakes it into `_auth_emails.ts` in place of the default; here we just make sure
+ * it does NOT also surface as an app-callable `Emails.*` template.
+ */
+export const RESERVED_AUTH_EMAIL_NAMES = new Set(['AuthConfirm', 'AuthReset', 'Auth2fa']);
+
 const TOKEN_RE = /\{\{\s*([A-Za-z_$][\w$]*)\s*\}\}/g;
 
 function extractTokens(s: string): string[] {
@@ -240,7 +249,7 @@ export function toPascal(base: string): string {
 
 /** Server source dir (where the generated module must live to be compiled): the
  *  dir of the first toilconfig entry, else `<root>/server`. */
-function serverDir(root: string): string {
+export function serverDir(root: string): string {
     try {
         const cfg = JSON.parse(fs.readFileSync(path.join(root, 'toilconfig.json'), 'utf8')) as {
             entries?: unknown;
@@ -344,6 +353,10 @@ export async function renderEmails(cfg: ResolvedToilConfig): Promise<void> {
     const rendered: RenderedEmail[] = [];
     try {
         for (const file of files) {
+            // Reserved auth-override templates (emails/auth-confirm.tsx, …) are
+            // consumed by the auth pipeline, not surfaced as generic `Emails.*`.
+            if (RESERVED_AUTH_EMAIL_NAMES.has(toPascal(path.basename(file).replace(/\.(tsx|jsx)$/, ''))))
+                continue;
             try {
                 const r = await renderEmailFile(
                     server,

package/src/compiler/index.ts

@@ -14,6 +14,7 @@ import type { RunningBackend } from 'toiljs/backend';
 
 import { loadConfig, type ResolvedToilConfig } from './config.js';
 import { renderEmails } from './emails.js';
+import { AUTH_EMAILS_GENERATED_BASENAME, renderAuthEmails } from './auth-emails.js';
 import { generate, TOIL_SERVER_ENV_DTS } from './generate.js';
 import { prerenderStaticParams } from './ssg.js';
 import {
@@ -179,6 +180,20 @@ function serverImportsAuth(root: string, files: string[]): boolean {
     return false;
 }
 
+/**
+ * Whether the built-in auth surface is on for this project: the `server.auth` config flag OR the
+ * escape-hatch `import 'toiljs/server/auth'` in a server entry. This is the SAME predicate
+ * `buildServer` uses to decide whether to inject `AuthController` (see `authOn` there); the email
+ * pipeline reuses it so `_auth_emails.ts` is generated exactly when the controller that calls
+ * `AuthEmail.*` is compiled in (a mismatch would be a missing-symbol compile error). Client-only
+ * projects (no `toilconfig.json`) are never auth-on.
+ */
+function serverAuthEnabled(root: string, configAuth: boolean): boolean {
+    if (configAuth) return true;
+    if (!fs.existsSync(path.join(root, 'toilconfig.json'))) return false;
+    return serverImportsAuth(root, serverEntryFiles(root));
+}
+
 /**
  * Builds the toilscript server target (which also regenerates `shared/server.ts` via
  * `--rpcModule`) when the project has one, signalled by a `toilconfig.json` at the root. This
@@ -581,6 +596,7 @@ function watchServer(cfg: ResolvedToilConfig, watcher: ViteDevServer['watcher'])
         // Recompile emails/*.tsx -> the generated module before the server build,
         // so editing an email template hot-reloads like any other server change.
         renderEmails(cfg)
+            .then(() => renderAuthEmails(cfg, serverAuthEnabled(root, cfg.auth)))
             .then(() => buildServer(root, cfg.auth))
             .then(() => process.stdout.write(pc.green('  ✓ ') + pc.dim('server rebuilt') + '\n'))
             .catch((e: unknown) =>
@@ -599,9 +615,10 @@ function watchServer(cfg: ResolvedToilConfig, watcher: ViteDevServer['watcher'])
     const isServerSource = (file: string): boolean =>
         file.endsWith('.ts') &&
         !file.endsWith('.d.ts') &&
-        // `_emails.ts` is GENERATED by renderEmails on every rebuild; reacting to
+        // `_emails.ts` / `_auth_emails.ts` are GENERATED on every rebuild; reacting to
         // our own output would loop forever (rebuild -> write -> rebuild -> ...).
         path.basename(file) !== '_emails.ts' &&
+        path.basename(file) !== AUTH_EMAILS_GENERATED_BASENAME &&
         dirs.some((dir) => file === dir || file.startsWith(dir + path.sep));
     const isEmailSource = (file: string): boolean =>
         /\.(tsx|jsx)$/.test(file) && (file === emailsDir || file.startsWith(emailsDir + path.sep));
@@ -863,6 +880,9 @@ export async function dev(opts: ToilCommandOptions = {}): Promise<ViteDevServer>
     if (hasServer) process.stdout.write(pc.dim('  building the server (toilscript)…') + '\n');
     // Compile emails/*.tsx -> generated server module BEFORE toilscript builds it in.
     await renderEmails(cfg);
+    // Built-in auth: (re)generate `<server>/_auth_emails.ts` (defaults + any emails/auth-*.tsx
+    // overrides) so the injected AuthController's `AuthEmail.*` senders compile in.
+    await renderAuthEmails(cfg, serverAuthEnabled(cfg.root, cfg.auth));
     // Generate the client codegen first so the SSR slots pre-pass can load the route graph, then
     // emit the server-importable `<server>/_ssr/<name>.slots.ts` BEFORE the server build so its
     // `render` can import them. Dev reuses the prior build's shell (or the template) for the HASH;
@@ -988,6 +1008,9 @@ export async function build(opts: ToilCommandOptions = {}): Promise<void> {
         process.stdout.write(pc.dim('  building the server (toilscript)…') + '\n');
     // Compile emails/*.tsx -> generated server module BEFORE toilscript builds it in.
     await renderEmails(cfg);
+    // Built-in auth: (re)generate `<server>/_auth_emails.ts` (defaults + any emails/auth-*.tsx
+    // overrides) so the injected AuthController's `AuthEmail.*` senders compile in.
+    await renderAuthEmails(cfg, serverAuthEnabled(cfg.root, cfg.auth));
     // Generate the client codegen (`.toil/globals.ts`, `.toil/index.html`, …) NOW — before the
     // server build — so the SSR slots pre-pass below can load the route/layout module graph and
     // render the opted-in routes.