toiljs 0.0.85 → 0.0.87

package/build/compiler/index.js

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import net from 'node:net';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import pc from 'picocolors';
 import { build as viteBuild, createServer, mergeConfig } from 'vite';
 import { loadConfig } from './config.js';
@@ -76,7 +77,48 @@ function serverEntryFiles(root) {
         visit(dir, 0);
     return [...result].sort();
 }
-export async function buildServer(root) {
+function authEntryFiles(root, appHasUser) {
+    const names = appHasUser ? ['AuthController.ts'] : ['AuthUser.ts', 'AuthController.ts'];
+    const primary = names.map((n) => path.posix.join('node_modules/toiljs/server/auth', n));
+    if (primary.every((rel) => fs.existsSync(path.join(root, rel))))
+        return primary;
+    try {
+        const pkgDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..');
+        const abs = names.map((n) => path.join(pkgDir, 'server', 'auth', n));
+        if (abs.every((p) => fs.existsSync(p)))
+            return abs.map((p) => path.relative(root, p).replace(/\\/g, '/'));
+    }
+    catch {
+    }
+    throw new Error('toiljs: server.auth is enabled but the built-in auth controller ' +
+        '(server/auth/AuthController.ts) was not found under node_modules/toiljs. ' +
+        'Reinstall toiljs (npm i toiljs), or remove server.auth from toil.config.ts.');
+}
+function serverDeclaresUser(root, files) {
+    const re = /(^|[^.\w])@user\b/m;
+    for (const rel of files) {
+        try {
+            if (re.test(fs.readFileSync(path.join(root, rel), 'utf8')))
+                return true;
+        }
+        catch {
+        }
+    }
+    return false;
+}
+function serverImportsAuth(root, files) {
+    const re = /(^|[^.\w])import\s+['"]toiljs\/server\/auth['"]/m;
+    for (const rel of files) {
+        try {
+            if (re.test(fs.readFileSync(path.join(root, rel), 'utf8')))
+                return true;
+        }
+        catch {
+        }
+    }
+    return false;
+}
+export async function buildServer(root, auth = false) {
     if (!fs.existsSync(path.join(root, 'toilconfig.json')))
         return;
     for (const dir of serverDirs(root)) {
@@ -89,6 +131,17 @@ export async function buildServer(root) {
     }
     const binJs = resolveToilscriptBin(root);
     const files = serverEntryFiles(root);
+    const authOn = auth || serverImportsAuth(root, files);
+    if (authOn) {
+        const appHasUser = serverDeclaresUser(root, files);
+        const authFiles = authEntryFiles(root, appHasUser);
+        const authSet = new Set(authFiles);
+        files.unshift(...authFiles);
+        for (let i = files.length - 1; i >= authFiles.length; i--) {
+            if (authSet.has(files[i]))
+                files.splice(i, 1);
+        }
+    }
     const split = splitSurfaceFiles(root, files);
     assertNoStreamInRequestTier(root, split);
     if (split.hasDaemon || split.hasStream) {
@@ -98,12 +151,14 @@ export async function buildServer(root) {
                 mode: 'cold',
                 outFile: artifacts.cold,
                 withRpc: false,
+                authUser: authOn,
             });
         if (split.hasStream && split.stream.length > 0)
             await runToilscriptPass(root, binJs, split.stream, {
                 mode: 'hot',
                 outFile: artifacts.stream,
                 withRpc: false,
+                authUser: authOn,
             });
         if (split.request.length > 0)
             await runToilscriptPass(root, binJs, split.request, {
@@ -111,12 +166,18 @@ export async function buildServer(root) {
                 outFile: serverWasmFile(root),
                 withRpc: true,
                 rpcSurfaceFiles: split.hasStream ? split.stream : undefined,
+                authUser: authOn,
             });
         if (split.hasStream && split.stream.length > 0)
             emitStreamClientSurface(root, artifacts.stream, split.stream);
         return;
     }
-    await runToilscriptPass(root, binJs, files, { mode: null, outFile: null, withRpc: true });
+    await runToilscriptPass(root, binJs, files, {
+        mode: null,
+        outFile: null,
+        withRpc: true,
+        authUser: authOn,
+    });
 }
 function resolveToilscriptBin(root) {
     const require = createRequire(path.join(root, 'package.json'));
@@ -272,6 +333,8 @@ function runToilscriptPass(root, binJs, files, opts) {
     if (opts.rpcSurfaceFiles)
         for (const surfaceFile of opts.rpcSurfaceFiles)
             args.push('--rpcSurfaceFiles', surfaceFile);
+    if (opts.authUser)
+        args.push('--authUser');
     args.push('--noConfigEntries');
     args.push('--disableWarning', '235');
     return new Promise((resolve, reject) => {
@@ -298,7 +361,7 @@ function watchServer(cfg, watcher) {
         building = true;
         process.stdout.write(pc.dim('  server changed, rebuilding…') + '\n');
         renderEmails(cfg)
-            .then(() => buildServer(root))
+            .then(() => buildServer(root, cfg.auth))
             .then(() => process.stdout.write(pc.green('  ✓ ') + pc.dim('server rebuilt') + '\n'))
             .catch((e) => process.stdout.write(pc.red(`  ✗ server rebuild failed: ${String(e)}`) + '\n'))
             .finally(() => {
@@ -486,7 +549,7 @@ export async function dev(opts = {}) {
     generate(cfg);
     if (hasServer)
         await extractServerSlots(cfg);
-    await buildServer(cfg.root);
+    await buildServer(cfg.root, cfg.auth);
     if (hasServer)
         process.stdout.write(pc.green('  ✓ ') + pc.dim('server built') + '\n');
     if (!hasServer) {
@@ -564,7 +627,7 @@ export async function build(opts = {}) {
     await renderEmails(cfg);
     generate(cfg);
     const priorServerSlots = hasServer ? await extractServerSlots(cfg) : new Map();
-    await buildServer(cfg.root);
+    await buildServer(cfg.root, cfg.auth);
     if (opts.serverOnly)
         return;
     if (hasServer)
@@ -584,7 +647,7 @@ export async function build(opts = {}) {
     const ssr = await extractTemplates(cfg, 'edge', priorServerSlots);
     if (ssr.serverSlotsChanged) {
         process.stdout.write(pc.dim('  SSR template changed; recompiling the server with the new hash…') + '\n');
-        await buildServer(cfg.root);
+        await buildServer(cfg.root, cfg.auth);
     }
 }
 export async function start(opts = {}) {