toiljs 0.0.115 → 0.0.117

package/build/compiler/index.js

@@ -297,6 +297,8 @@ export function assertNoStreamInRequestTier(root, split) {
     const queue = [...split.request];
     while (queue.length > 0) {
         const rel = queue.pop();
+        if (rel === undefined)
+            break;
         if (seen.has(rel))
             continue;
         seen.add(rel);
@@ -330,7 +332,7 @@ export function assertNoStreamInRequestTier(root, split) {
             '\nRemove the import, or move the code into a *.stream.ts module.');
     }
 }
-function runToilscriptPass(root, binJs, files, opts) {
+async function runToilscriptPass(root, binJs, files, opts) {
     const args = [binJs, ...files, '--target', 'release'];
     if (opts.mode !== null)
         args.push('--targetMode', opts.mode);
@@ -347,13 +349,25 @@ function runToilscriptPass(root, binJs, files, opts) {
         args.push('--lib', AUTH_EMAILS_LIB_SUBDIR);
     args.push('--noConfigEntries');
     args.push('--disableWarning', '235');
-    return new Promise((resolve, reject) => {
+    await new Promise((resolve, reject) => {
         const child = spawn(process.execPath, args, { cwd: root, stdio: 'inherit' });
         child.on('error', reject);
         child.on('close', (code) => code === 0
             ? resolve()
             : reject(new Error(`toilscript ${opts.mode ?? 'release'} build failed (exit ${String(code)})`)));
     });
+    if (opts.withRpc) {
+        const generated = path.join(root, 'shared/server.ts');
+        if (fs.existsSync(generated)) {
+            const source = fs.readFileSync(generated, 'utf8');
+            const updated = migrateGeneratedRpcClient(source);
+            if (source !== updated)
+                fs.writeFileSync(generated, updated);
+        }
+    }
+}
+export function migrateGeneratedRpcClient(source) {
+    return source.replace(/(async function __toilRpcCall\(__id: number, __body: )Uint8Array(?=\))/, '$1Uint8Array<ArrayBuffer>');
 }
 function watchServer(cfg, watcher) {
     const root = cfg.root;
@@ -722,7 +736,11 @@ function lebU(buf, pos) {
     return [result >>> 0, p];
 }
 function customSectionBytes(wasm, want) {
-    if (wasm.length < 8 || wasm[0] !== 0x00 || wasm[1] !== 0x61 || wasm[2] !== 0x73 || wasm[3] !== 0x6d)
+    if (wasm.length < 8 ||
+        wasm[0] !== 0x00 ||
+        wasm[1] !== 0x61 ||
+        wasm[2] !== 0x73 ||
+        wasm[3] !== 0x6d)
         return null;
     let pos = 8;
     try {
@@ -853,7 +871,10 @@ function emitStreamClientSurface(root, streamWasmPath, streamFiles) {
     if (catalog.length === 0)
         return;
     const classByRoute = new Map(scanStreamSource(root, streamFiles).map((s) => [s.route, s.className]));
-    const streams = catalog.map((c) => ({ key: classByRoute.get(c.route) ?? c.name, route: c.route }));
+    const streams = catalog.map((c) => ({
+        key: classByRoute.get(c.route) ?? c.name,
+        route: c.route,
+    }));
     const rpcModule = path.join(root, 'shared', 'server.ts');
     let existing = '';
     try {

package/build/compiler/pages.js

@@ -1,9 +1,8 @@
-import { extractStaticExports, loadTypeScriptSync } from './prerender.js';
+import { extractStaticExports } from './prerender.js';
 function isDynamic(pattern) {
     return /[:*]/.test(pattern);
 }
 export function buildPageIndex(root, routes) {
-    const ts = loadTypeScriptSync(root);
     const seen = new Set();
     const pages = [];
     for (const route of routes) {
@@ -12,7 +11,7 @@ export function buildPageIndex(root, routes) {
         if (seen.has(route.pattern))
             continue;
         seen.add(route.pattern);
-        const exports = ts ? extractStaticExports(ts, route.file, ['metadata', 'searchHints']) : {};
+        const exports = extractStaticExports(route.file, ['metadata', 'searchHints']);
         const metadata = { ...exports.metadata, ...exports.searchHints };
         pages.push({ path: route.pattern, dynamic: isDynamic(route.pattern), metadata });
     }

package/build/compiler/prerender.d.ts

@@ -1,11 +1,6 @@
-import type * as TS from 'typescript';
 import type { Plugin } from 'vite';
 import { type ResolvedToilConfig } from './config.js';
-type Ts = typeof TS;
-export declare function loadTypeScript(root: string): Promise<Ts | null>;
-export declare function loadTypeScriptSync(root: string): Ts | null;
-export declare function extractStaticExports(ts: Ts, filePath: string, names: readonly string[]): Record<string, Record<string, unknown>>;
-export declare function extractStaticMetadata(ts: Ts, filePath: string): Record<string, unknown> | null;
-export declare function exportsTrue(ts: Ts, filePath: string, name: string): boolean;
+export declare function extractStaticExports(filePath: string, names: readonly string[]): Record<string, Record<string, unknown>>;
+export declare function extractStaticMetadata(filePath: string): Record<string, unknown> | null;
+export declare function exportsTrue(filePath: string, name: string): boolean;
 export declare function prerenderPlugin(cfg: ResolvedToilConfig): Plugin;
-export {};

package/build/compiler/prerender.js

@@ -1,101 +1,73 @@
-import { createRequire } from 'node:module';
 import fs from 'node:fs';
 import path from 'node:path';
-import { pathToFileURL } from 'node:url';
+import { parseSync } from 'oxc-parser';
 import { patternToBracketFile, scanRoutes, staticSectionPattern } from './routes.js';
 import { injectSeoHtml, routeSeo } from './seo.js';
-function isCompilerApi(mod) {
-    const ts = mod;
-    return (typeof ts?.createSourceFile === 'function' &&
-        typeof ts.isVariableStatement === 'function' &&
-        typeof ts.ScriptTarget === 'object' &&
-        typeof ts.ScriptKind === 'object' &&
-        typeof ts.SyntaxKind === 'object');
-}
-let warnedUnusable = false;
-function warnUnusableTypeScript(mod) {
-    if (warnedUnusable)
-        return;
-    warnedUnusable = true;
-    const version = mod?.version;
-    process.stderr.write(`  toil: typescript${version ? `@${version}` : ''} does not expose the compiler API ` +
-        `(TypeScript 7 moved it to 'typescript/unstable/*').\n` +
-        `  toil: route metadata will NOT be baked into the built HTML. Install typescript ^6 to restore it.\n`);
-}
-export async function loadTypeScript(root) {
-    let mod;
-    try {
-        const resolved = createRequire(path.join(root, 'package.json')).resolve('typescript');
-        const ns = (await import(pathToFileURL(resolved).href));
-        mod = ns.default ?? ns;
-    }
-    catch {
-        return null;
-    }
-    if (isCompilerApi(mod))
-        return mod;
-    warnUnusableTypeScript(mod);
-    return null;
-}
-export function loadTypeScriptSync(root) {
-    let mod;
-    try {
-        mod = createRequire(path.join(root, 'package.json'))('typescript');
-    }
-    catch {
-        return null;
-    }
-    const ts = mod?.default ?? mod;
-    if (isCompilerApi(ts))
-        return ts;
-    warnUnusableTypeScript(ts);
-    return null;
-}
 const UNRESOLVED = Symbol('unresolved');
-function evalNode(ts, node) {
-    if (ts.isStringLiteral(node) || ts.isNoSubstitutionTemplateLiteral(node))
-        return node.text;
-    if (ts.isNumericLiteral(node))
-        return Number(node.text);
-    if (node.kind === ts.SyntaxKind.TrueKeyword)
-        return true;
-    if (node.kind === ts.SyntaxKind.FalseKeyword)
-        return false;
-    if (node.kind === ts.SyntaxKind.NullKeyword)
-        return null;
-    if (ts.isArrayLiteralExpression(node)) {
-        const out = [];
-        for (const el of node.elements) {
-            const value = evalNode(ts, el);
-            if (value === UNRESOLVED)
+function evalNode(node) {
+    switch (node.type) {
+        case 'Literal':
+            return 'regex' in node || 'bigint' in node ? UNRESOLVED : node.value;
+        case 'TemplateLiteral':
+            return node.expressions.length === 0 ? node.quasis[0].value.cooked : UNRESOLVED;
+        case 'TSAsExpression':
+        case 'TSSatisfiesExpression':
+        case 'TSNonNullExpression':
+        case 'TSTypeAssertion':
+        case 'ParenthesizedExpression':
+            return evalNode(node.expression);
+        case 'UnaryExpression': {
+            const value = evalNode(node.argument);
+            if (typeof value !== 'number')
                 return UNRESOLVED;
-            out.push(value);
+            return node.operator === '-' ? -value : node.operator === '+' ? value : UNRESOLVED;
         }
-        return out;
+        case 'ArrayExpression': {
+            const values = [];
+            for (const element of node.elements) {
+                if (!element || element.type === 'SpreadElement')
+                    return UNRESOLVED;
+                const value = evalNode(element);
+                if (value === UNRESOLVED)
+                    return UNRESOLVED;
+                values.push(value);
+            }
+            return values;
+        }
+        case 'ObjectExpression':
+            return evalObject(node);
+        default:
+            return UNRESOLVED;
     }
-    if (ts.isObjectLiteralExpression(node))
-        return evalObject(ts, node);
-    return UNRESOLVED;
 }
-function evalObject(ts, node) {
-    const obj = {};
-    for (const prop of node.properties) {
-        if (!ts.isPropertyAssignment(prop))
+function evalObject(node) {
+    const result = {};
+    for (const property of node.properties) {
+        if (property.type !== 'Property' ||
+            property.computed ||
+            property.method ||
+            property.kind !== 'init')
             continue;
-        const key = ts.isIdentifier(prop.name)
-            ? prop.name.text
-            : ts.isStringLiteral(prop.name)
-                ? prop.name.text
+        const key = property.key.type === 'Identifier'
+            ? property.key.name
+            : property.key.type === 'Literal' && typeof property.key.value === 'string'
+                ? property.key.value
                 : null;
         if (key === null)
             continue;
-        const value = evalNode(ts, prop.initializer);
-        if (value !== UNRESOLVED)
-            obj[key] = value;
+        const value = evalNode(property.value);
+        if (value !== UNRESOLVED) {
+            Object.defineProperty(result, key, {
+                value,
+                enumerable: true,
+                configurable: true,
+                writable: true,
+            });
+        }
     }
-    return obj;
+    return result;
 }
-export function extractStaticExports(ts, filePath, names) {
+function staticExports(filePath, names) {
     let source;
     try {
         source = fs.readFileSync(filePath, 'utf8');
@@ -103,58 +75,48 @@ export function extractStaticExports(ts, filePath, names) {
     catch {
         return {};
     }
-    const wanted = new Set(names);
-    const out = {};
-    const sf = ts.createSourceFile(filePath, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
-    for (const stmt of sf.statements) {
-        if (!ts.isVariableStatement(stmt))
+    const parsed = parseSync(filePath, source);
+    if (parsed.errors.length)
+        throw new Error(`Cannot parse route ${filePath}: ${parsed.errors.map((e) => e.message).join('; ')}`);
+    const result = Object.create(null);
+    for (const statement of parsed.program.body) {
+        if (statement.type !== 'ExportNamedDeclaration' ||
+            statement.declaration?.type !== 'VariableDeclaration')
             continue;
-        if (!stmt.modifiers?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword))
-            continue;
-        for (const decl of stmt.declarationList.declarations) {
-            if (ts.isIdentifier(decl.name) &&
-                wanted.has(decl.name.text) &&
-                !(decl.name.text in out) &&
-                decl.initializer &&
-                ts.isObjectLiteralExpression(decl.initializer)) {
-                out[decl.name.text] = evalObject(ts, decl.initializer);
-            }
+        for (const declaration of statement.declaration.declarations) {
+            if (declaration.id.type !== 'Identifier' ||
+                !names.includes(declaration.id.name) ||
+                !declaration.init)
+                continue;
+            if (Object.hasOwn(result, declaration.id.name))
+                continue;
+            const value = evalNode(declaration.init);
+            if (value !== UNRESOLVED)
+                result[declaration.id.name] = value;
         }
     }
-    return out;
+    return result;
 }
-export function extractStaticMetadata(ts, filePath) {
-    return extractStaticExports(ts, filePath, ['metadata']).metadata ?? null;
-}
-export function exportsTrue(ts, filePath, name) {
-    let source;
-    try {
-        source = fs.readFileSync(filePath, 'utf8');
-    }
-    catch {
-        return false;
-    }
-    const sf = ts.createSourceFile(filePath, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
-    for (const stmt of sf.statements) {
-        if (!ts.isVariableStatement(stmt))
-            continue;
-        if (!stmt.modifiers?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword))
-            continue;
-        for (const decl of stmt.declarationList.declarations) {
-            if (ts.isIdentifier(decl.name) &&
-                decl.name.text === name &&
-                decl.initializer?.kind === ts.SyntaxKind.TrueKeyword) {
-                return true;
-            }
+export function extractStaticExports(filePath, names) {
+    const result = {};
+    for (const [name, value] of Object.entries(staticExports(filePath, names))) {
+        if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+            Object.defineProperty(result, name, { value, enumerable: true });
         }
     }
-    return false;
+    return result;
+}
+export function extractStaticMetadata(filePath) {
+    return extractStaticExports(filePath, ['metadata']).metadata ?? null;
+}
+export function exportsTrue(filePath, name) {
+    return staticExports(filePath, [name])[name] === true;
 }
 export function prerenderPlugin(cfg) {
     return {
         name: 'toil:prerender-seo',
         apply: 'build',
-        async closeBundle() {
+        closeBundle() {
             if (!cfg.seo)
                 return;
             const outDir = path.resolve(cfg.root, cfg.outDir);
@@ -163,13 +125,12 @@ export function prerenderPlugin(cfg) {
                 return;
             const shell = fs.readFileSync(shellPath, 'utf8');
             fs.writeFileSync(path.join(cfg.toilDir, 'shell.html'), shell);
-            const ts = await loadTypeScript(cfg.root);
             const routes = scanRoutes(cfg.routesAbsDir).filter((r) => r.slot === undefined && !r.intercept);
             for (const route of routes) {
                 const isDynamic = /[:*]/.test(route.pattern);
-                if (isDynamic && ts && exportsTrue(ts, route.file, 'ssr'))
+                if (isDynamic && exportsTrue(route.file, 'ssr'))
                     continue;
-                const metadata = ts ? extractStaticMetadata(ts, route.file) : null;
+                const metadata = extractStaticMetadata(route.file);
                 const seoPattern = isDynamic ? staticSectionPattern(route.pattern) : route.pattern;
                 const html = injectSeoHtml(shell, routeSeo(cfg.seo, metadata, seoPattern));
                 const target = isDynamic

package/build/compiler/ssg.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { createServer } from 'vite';
-import { extractStaticMetadata, loadTypeScript } from './prerender.js';
+import { extractStaticMetadata } from './prerender.js';
 import { scanRoutes } from './routes.js';
 import { injectSeoHtml, joinUrl, llmsTxt, routeSeo, sitemapXml } from './seo.js';
 import { createViteConfig } from './vite.js';
@@ -35,7 +35,7 @@ export async function prerenderStaticParams(cfg) {
     const shell = fs.readFileSync(shellPath, 'utf8');
     const server = await createServer({
         ...(await createViteConfig(cfg)),
-        server: { middlewareMode: true, hmr: false },
+        server: { middlewareMode: true, hmr: false, ws: false },
         appType: 'custom',
         logLevel: 'silent',
     });
@@ -105,11 +105,10 @@ export async function prerenderStaticParams(cfg) {
         process.stdout.write(`  ✓ prerendered ${String(generated.length)} dynamic route${generated.length === 1 ? '' : 's'}\n`);
     }
     if (baseUrl !== undefined) {
-        const ts = await loadTypeScript(cfg.root);
         const staticPages = allRoutes
             .filter((r) => r.slot === undefined && !r.intercept && !/[:*]/.test(r.pattern))
             .map((r) => {
-            const meta = ts ? extractStaticMetadata(ts, r.file) : null;
+            const meta = extractStaticMetadata(r.file);
             return {
                 title: metaString(meta, 'title') ?? (r.pattern === '/' ? 'Home' : r.pattern),
                 url: joinUrl(baseUrl, r.pattern),

package/build/compiler/template-build.js

@@ -9,7 +9,7 @@ import { scanRoutes } from './routes.js';
 import { generateSlotsModule } from './ssr-codegen.js';
 import { assignSlotIds, coherenceHash, encodeSlots, extractFromHtml, } from './template.js';
 import { createViteConfig } from './vite.js';
-import { extractStaticMetadata, loadTypeScript } from './prerender.js';
+import { extractStaticMetadata } from './prerender.js';
 import { escapeAttr, escapeHtml, injectSeoHtml, routeSeo } from './seo.js';
 const SSR_MARKER = '<template id="__toil_ssr"></template>';
 const ROOT_DIV = '<div id="root"></div>';
@@ -151,13 +151,12 @@ async function renderSsrRoutes(cfg, shell) {
     const routes = scanRoutes(cfg.routesAbsDir).filter((r) => r.slot === undefined && !r.intercept);
     if (routes.length === 0)
         return [];
-    const ts = cfg.seo ? await loadTypeScript(cfg.root) : null;
     const warn = (msg) => {
         process.stderr.write(`  toil: SSR ${msg}\n`);
     };
     const server = await createServer({
         ...(await createViteConfig(cfg)),
-        server: { middlewareMode: true, hmr: false },
+        server: { middlewareMode: true, hmr: false, ws: false },
         appType: 'custom',
         logLevel: 'silent',
     });
@@ -197,7 +196,7 @@ async function renderSsrRoutes(cfg, shell) {
                     const lm = (await server.ssrLoadModule(lf));
                     layouts.push(lm.default);
                 }
-                const metadata = ts ? extractStaticMetadata(ts, r.file) : null;
+                const metadata = extractStaticMetadata(r.file);
                 const name = routeTemplateName(r.pattern);
                 client.__setSsrLocation(samplePath(r.pattern));
                 const art = extractRouteTemplate({