@hatk/hatk 0.0.1-alpha.11 → 0.0.1-alpha.111

package/dist/test.js

@@ -1,27 +1,32 @@
 import { resolve, dirname } from 'node:path';
 import { readdirSync, readFileSync } from 'node:fs';
+import { registerHatkResolveHook } from "./resolve-hatk.js";
 import YAML from 'yaml';
 import { loadConfig } from "./config.js";
-import { loadLexicons, storeLexicons, discoverCollections, generateTableSchema, generateCreateTableSQL, } from "./schema.js";
-import { initDatabase, querySQL, runSQL, insertRecord, closeDatabase } from "./db.js";
-import { initFeeds, executeFeed, listFeeds, createPaginate } from "./feeds.js";
-import { initXrpc, executeXrpc, listXrpc, configureRelay } from "./xrpc.js";
-import { initOpengraph } from "./opengraph.js";
-import { initLabels } from "./labels.js";
+import { validatableLexicons, loadLexicons, storeLexicons, discoverCollections, generateTableSchema, generateCreateTableSQL, } from "./database/schema.js";
+import { initDatabase, querySQL, runSQL, insertRecord, closeDatabase } from "./database/db.js";
+import { createAdapter } from "./database/adapter-factory.js";
+import { SQLITE_DIALECT } from "./database/dialect.js";
+import { rebuildAllIndexes, setSearchPort } from "./database/fts.js";
+import { executeFeed, listFeeds, createPaginate } from "./feeds.js";
+import { executeXrpc, listXrpc, configureRelay, configureCdn } from "./xrpc.js";
+import { initServer } from "./server-init.js";
 import { discoverViews } from "./views.js";
-import { loadOnLoginHook } from "./oauth/hooks.js";
 import { validateLexicons } from '@bigmoves/lexicon';
-import { packCursor, unpackCursor, isTakendownDid, filterTakendownDids } from "./db.js";
+import { packCursor, unpackCursor, isTakendownDid, filterTakendownDids } from "./database/db.js";
 import { seed as createSeedHelpers } from "./seed.js";
+import { setPrivateCollections } from "./private-collections.js";
+import { spaceFilterSql } from "./spaces/visibility.js";
+import { guardedQuerySQL, unfilteredQuerySQL } from "./spaces/guard.js";
 /**
- * Find the project's config.yaml by walking up from cwd.
- * Returns the resolved config path, or falls back to 'config.yaml'.
+ * Find the project's hatk.config.ts by walking up from cwd.
+ * Returns the resolved config path, or falls back to 'hatk.config.ts'.
  */
 function findConfigPath() {
     const explicit = process.env.APPVIEW_CONFIG;
     if (explicit)
         return resolve(explicit);
-    return resolve('config.yaml');
+    return resolve('hatk.config.ts');
 }
 /**
  * Boot an in-memory hatk context for unit tests.
@@ -33,13 +38,15 @@ function findConfigPath() {
  * but it will NOT work with --pool=threads (multiple tests sharing a process).
  */
 export async function createTestContext() {
+    registerHatkResolveHook();
     const configPath = findConfigPath();
-    const config = loadConfig(configPath);
+    const config = await loadConfig(configPath);
     const configDir = dirname(resolve(configPath));
     configureRelay(config.relay);
+    configureCdn(config.cdn);
     // Load and validate lexicons
     const lexicons = loadLexicons(resolve(configDir, 'lexicons'));
-    const lexiconErrors = validateLexicons([...lexicons.values()]);
+    const lexiconErrors = validateLexicons(validatableLexicons(lexicons));
     if (lexiconErrors) {
         const messages = Object.entries(lexiconErrors).flatMap(([nsid, errs]) => errs.map((e) => `${nsid}: ${e}`));
         throw new Error(`Invalid lexicons:\n${messages.join('\n')}`);
@@ -56,25 +63,30 @@ export async function createTestContext() {
             continue;
         const schema = generateTableSchema(nsid, lexicon, lexicons);
         schemas.push(schema);
-        ddlStatements.push(generateCreateTableSQL(schema));
+        ddlStatements.push(generateCreateTableSQL(schema, SQLITE_DIALECT));
     }
-    // In-memory DuckDB
-    await initDatabase(':memory:', schemas, ddlStatements);
-    // Discover views + hooks
+    // In-memory SQLite — faster startup, no native module issues in Vite's module runner
+    const { adapter, searchPort } = await createAdapter('sqlite');
+    setSearchPort(searchPort);
+    await initDatabase(adapter, ':memory:', schemas, ddlStatements);
+    // Create the FTS shadow tables up front. main.ts does this after backfill;
+    // a test has no backfill, so without it the tables never exist and every
+    // ctx.search() fails its BM25 phase with "no such table: _fts_...". SQLite
+    // has no fuzzy phase to fall back on — jaroWinklerSimilarity is null there —
+    // so the failure surfaces as an empty result rather than an error, which is
+    // why it went unnoticed.
+    //
+    // The indexes are empty at this point; what matters is that this also fills
+    // the search-column cache, which is what lets insertRecord() index each
+    // record as it is written. Records inserted with raw SQL bypass that path and
+    // remain unsearchable, as they do in production.
+    await rebuildAllIndexes(collections);
+    // Discover views
     discoverViews();
-    try {
-        await loadOnLoginHook(resolve(configDir, 'hooks'));
-    }
-    catch { }
-    // Skip setup hooks in test context — they're for server boot-time
-    // initialization (e.g. importing large datasets) and not appropriate for tests
-    // Discover feeds, xrpc, labels
-    await initFeeds(resolve(configDir, 'feeds'));
-    await initXrpc(resolve(configDir, 'xrpc'));
-    await initOpengraph(resolve(configDir, 'og'));
-    await initLabels(resolve(configDir, 'labels'));
+    // Discover feeds, xrpc, labels, hooks, og from server/ directory (skip setup scripts in tests)
+    await initServer(resolve(configDir, 'server'), { skipSetup: true });
     return {
-        db: { query: querySQL, run: runSQL },
+        db: { query: guardedQuerySQL, run: runSQL, unfiltered: unfilteredQuerySQL },
         _config: config,
         _collections: collections,
         loadFixtures: async (dir) => {
@@ -94,7 +106,12 @@ export async function createTestContext() {
                 if (Array.isArray(records)) {
                     for (const rec of records) {
                         const row = interpolateHelpers(rec);
-                        await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`, row.did, row.status || 'active', row.handle || row.did.split(':').pop() + '.test', new Date().toISOString());
+                        await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`, [
+                            row.did,
+                            row.status || 'active',
+                            row.handle || row.did.split(':').pop() + '.test',
+                            new Date().toISOString(),
+                        ]);
                     }
                 }
             }
@@ -119,7 +136,7 @@ export async function createTestContext() {
                         const row = interpolateHelpers(rec);
                         const vals = keys.map((k) => row[k]);
                         const placeholders = keys.map((_, i) => `$${i + 1}`).join(', ');
-                        await runSQL(`INSERT INTO "${tableName}" (${keys.map((k) => `"${k}"`).join(', ')}) VALUES (${placeholders})`, ...vals);
+                        await runSQL(`INSERT INTO "${tableName}" (${keys.map((k) => `"${k}"`).join(', ')}) VALUES (${placeholders})`, vals);
                     }
                     continue;
                 }
@@ -133,7 +150,12 @@ export async function createTestContext() {
                     // Auto-register DID in _repos if not already present
                     if (!seenDids.has(did)) {
                         seenDids.add(did);
-                        await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`, did, 'active', did.split(':').pop() + '.test', new Date().toISOString());
+                        await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`, [
+                            did,
+                            'active',
+                            did.split(':').pop() + '.test',
+                            new Date().toISOString(),
+                        ]);
                     }
                     await insertRecord(tableName, uri, cid, did, fields);
                 }
@@ -164,14 +186,14 @@ export async function createTestContext() {
         },
         feedContext: (opts) => {
             const paginateDeps = {
-                db: { query: querySQL },
+                db: { query: guardedQuerySQL, unfiltered: unfilteredQuerySQL },
                 cursor: opts?.cursor,
                 limit: opts?.limit || 30,
                 packCursor,
                 unpackCursor,
             };
             return {
-                db: { query: querySQL },
+                db: { query: guardedQuerySQL, unfiltered: unfilteredQuerySQL },
                 params: opts?.params || {},
                 cursor: opts?.cursor,
                 limit: opts?.limit || 30,
@@ -181,6 +203,7 @@ export async function createTestContext() {
                 isTakendown: isTakendownDid,
                 filterTakendownDids,
                 paginate: createPaginate(paginateDeps),
+                spaceFilter: spaceFilterSql,
             };
         },
         close: async () => {
@@ -220,10 +243,11 @@ export async function startTestServer() {
     // Import startServer — it creates the HTTP server and returns it
     const { startServer } = await import("./server.js");
     // Start server on port 0 (random available port)
-    const resolveViewer = (req) => {
-        const did = req.headers['x-test-viewer'];
+    const resolveViewer = (request) => {
+        const did = request.headers.get('x-test-viewer');
         return typeof did === 'string' ? { did } : null;
     };
+    setPrivateCollections(ctx._config.privateCollections);
     const httpServer = startServer(0, ctx._collections, ctx._config.publicDir, ctx._config.oauth, ctx._config.admins, resolveViewer);
     await new Promise((resolve) => httpServer.on('listening', resolve));
     const port = httpServer.address().port;

package/dist/views.js

@@ -3,7 +3,7 @@
 //   1. Inline views: defined in the record lexicon with ref: "#main" (e.g., playView)
 //   2. Defs views: defined in a defs lexicon, associated by naming convention (e.g., profileView)
 import { log } from "./logger.js";
-import { getAllLexicons, getLexicon } from "./schema.js";
+import { getAllLexicons, getLexicon } from "./database/schema.js";
 // --- Registry ---
 /** All views keyed by full NSID (e.g., "fm.teal.alpha.feed.play#playView") */
 const views = new Map();

package/dist/vite-plugin.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from 'vite';
+import { type Plugin } from 'vite';
 export declare function hatk(opts?: {
     port?: number;
 }): Plugin;

package/dist/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,IAAI,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAuFrD"}
+{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,MAAM,EAA6C,MAAM,MAAM,CAAA;AA8D3G,wBAAgB,IAAI,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAoOrD"}

package/dist/vite-plugin.js

@@ -1,87 +1,275 @@
-import { spawn } from 'node:child_process';
+import { createRunnableDevEnvironment } from 'vite';
 import { resolve } from 'node:path';
 import { existsSync } from 'node:fs';
+import { execSync } from 'node:child_process';
+import { isHatkRoute } from "./adapter.js";
+/** Boot the local PDS if a docker-compose.yml exists. */
+async function ensurePds() {
+    if (!existsSync(resolve('docker-compose.yml')))
+        return;
+    try {
+        const res = await fetch('http://localhost:2583/xrpc/_health');
+        if (res.ok)
+            return;
+    }
+    catch { }
+    console.log('[hatk] Starting PDS...');
+    execSync('docker compose up -d', { stdio: 'inherit', cwd: process.cwd() });
+    for (let i = 0; i < 30; i++) {
+        try {
+            const res = await fetch('http://localhost:2583/xrpc/_health');
+            if (res.ok) {
+                console.log('[hatk] PDS ready');
+                return;
+            }
+        }
+        catch { }
+        await new Promise((r) => setTimeout(r, 1000));
+    }
+    console.error('[hatk] PDS failed to start');
+}
+/** Run seed file if it exists. */
+function runSeed() {
+    const seedFile = resolve('seeds/seed.ts');
+    if (!existsSync(seedFile))
+        return;
+    try {
+        execSync(`npx tsx ${seedFile}`, { stdio: 'inherit', cwd: process.cwd() });
+    }
+    catch { }
+}
+/** Walk all loaded modules in the module graphs to collect CSS URLs for SSR. */
+function collectAllCss(server) {
+    const cssUrls = new Set();
+    for (const envName of ['hatk', 'client']) {
+        const env = server.environments[envName];
+        if (!env?.moduleGraph)
+            continue;
+        // TODO: uses internal Vite module graph API — may break across Vite minor versions
+        for (const mod of env.moduleGraph.idToModuleMap?.values?.() ?? []) {
+            const url = mod.url || '';
+            if (/\.(css|scss|less|styl|stylus|pcss|postcss)(\?|$)/.test(url)) {
+                cssUrls.add(url);
+            }
+            if (url.includes('type=style')) {
+                cssUrls.add(url);
+            }
+        }
+    }
+    if (cssUrls.size === 0)
+        return '';
+    return Array.from(cssUrls)
+        .map((url) => `<link rel="stylesheet" href="${url}">`)
+        .join('\n');
+}
 export function hatk(opts) {
-    const devPort = 3000;
-    const backendPort = opts?.port ?? devPort + 1;
-    const issuer = `http://127.0.0.1:${devPort}`;
-    let serverProcess = null;
+    const devPort = opts?.port ?? 3000;
+    let handler = null;
+    let ssrRenderPage = null;
+    let ssrGetRenderer = null;
+    let reloadServer = null;
+    let reloadTimer = null;
     return {
         name: 'vite-plugin-hatk',
+        // Rewrite $hatk imports in source code so SSR module runners can resolve them.
+        // vite-plus's fetchModule bypasses resolve.alias for bare imports.
+        transform(code, _id) {
+            if (!code.includes('$hatk'))
+                return;
+            const hatk = resolve('hatk.generated.ts');
+            const hatkClient = resolve('hatk.generated.client.ts');
+            return code
+                .replace(/from\s+['"](\$hatk\/client)['"]/g, `from '${hatkClient}'`)
+                .replace(/from\s+['"](\$hatk)['"]/g, `from '${hatk}'`);
+        },
         config() {
-            const target = `http://127.0.0.1:${backendPort}`;
-            // changeOrigin: false preserves the original Host header so DPoP htu matches
-            const rule = { target, changeOrigin: false };
             return {
-                server: {
-                    host: '127.0.0.1',
-                    port: devPort,
-                    proxy: {
-                        '/xrpc': rule,
-                        '/oauth/par': rule,
-                        '/oauth/token': rule,
-                        '/oauth/jwks': rule,
-                        '/oauth/authorize': rule,
-                        '/oauth/callback': {
-                            ...rule,
-                            // Only proxy the PDS callback (iss !== our issuer) to the backend.
-                            // The client-side callback (iss === our issuer) should reach the SPA.
-                            bypass(req) {
-                                const url = new URL(req.url, issuer);
-                                if (url.searchParams.get('iss') === issuer)
-                                    return req.url;
-                            },
-                        },
-                        '/oauth/client-metadata.json': rule,
-                        '/oauth-client-metadata.json': rule,
-                        '/.well-known': rule,
-                        '/info': rule,
-                        '/repos': rule,
-                        '/og': rule,
-                        '/admin': rule,
-                        '/_health': rule,
+                resolve: {
+                    alias: {
+                        '$hatk/client': resolve('hatk.generated.client.ts'),
+                        $hatk: resolve('hatk.generated.ts'),
                     },
                 },
-                test: {
-                    projects: [
-                        {
-                            test: {
-                                name: 'unit',
-                                include: ['test/feeds/**/*.test.ts', 'test/xrpc/**/*.test.ts'],
+                environments: {
+                    hatk: {
+                        resolve: {
+                            conditions: ['svelte'],
+                            noExternal: ['svelte', '@tanstack/svelte-query'],
+                            external: true,
+                        },
+                        dev: {
+                            createEnvironment(name, config) {
+                                return createRunnableDevEnvironment(name, config);
+                            },
+                            optimizeDeps: {
+                                exclude: ['better-sqlite3', '@duckdb/node-api'],
                             },
                         },
-                        {
-                            test: {
-                                name: 'integration',
-                                include: ['test/integration/**/*.test.ts'],
+                        build: {
+                            outDir: 'dist/server',
+                            ssr: true,
+                            rollupOptions: {
+                                external: ['better-sqlite3', '@duckdb/node-api'],
                             },
                         },
-                    ],
+                    },
+                },
+                server: {
+                    host: '127.0.0.1',
+                    port: devPort,
+                    fs: {
+                        allow: ['.'],
+                    },
+                    watch: {
+                        ignored: ['**/db/**', '**/data/**'],
+                    },
                 },
             };
         },
-        configureServer(server) {
-            const mainPath = resolve(import.meta.dirname, 'main.js');
-            const watchDirs = ['xrpc', 'feeds', 'labels', 'jobs', 'setup', 'lexicons'].filter((d) => existsSync(d));
-            const watchArgs = watchDirs.flatMap((d) => ['--watch-path', d]);
-            serverProcess = spawn('npx', ['tsx', 'watch', ...watchArgs, mainPath, 'config.yaml'], {
-                stdio: 'inherit',
-                cwd: process.cwd(),
-                env: {
-                    ...process.env,
-                    PORT: String(backendPort),
-                    OAUTH_ISSUER: process.env.OAUTH_ISSUER || issuer,
-                    DEV_MODE: '1',
-                },
-            });
-            server.httpServer?.on('close', () => {
-                serverProcess?.kill();
-                serverProcess = null;
+        async configureServer(server) {
+            // Skip hatk server boot in test mode — tests manage their own context
+            if (process.env.VITEST)
+                return;
+            // Boot PDS and run seeds before starting
+            await ensurePds();
+            runSeed();
+            const env = server.environments.hatk;
+            if (!env || !('runner' in env)) {
+                console.error('[hatk] hatk environment not available — is Vite 8 with Environment API?');
+                return;
+            }
+            // Load the hatk boot module through the module runner
+            const mainPath = resolve(import.meta.dirname, 'dev-entry.js');
+            const mod = await env.runner.import(mainPath);
+            handler = mod.handler;
+            ssrRenderPage = mod.renderPage;
+            ssrGetRenderer = mod.getRenderer;
+            reloadServer = mod.reloadServer;
+            globalThis.__hatk_callXrpc = mod.callXrpc;
+            // Capture cookie parser and name for SSR viewer resolution
+            const ssrParseSessionCookie = mod.parseSessionCookie ?? null;
+            globalThis.__hatk_parseSessionCookie = ssrParseSessionCookie;
+            globalThis.__hatk_sessionCookieName = mod.getSessionCookieName?.() ?? '__hatk_session';
+            if (ssrGetRenderer?.()) {
+                console.log('[hatk] SSR ready');
+            }
+            // API routes — must run before Vite's static middleware
+            server.middlewares.use(async (req, res, next) => {
+                const url = new URL(req.url, `http://localhost:${devPort}`);
+                if (!isHatkRoute(url.pathname) || !handler) {
+                    next();
+                    return;
+                }
+                try {
+                    const { toRequest, sendResponse } = await import('./adapter.js');
+                    const request = toRequest(req, `http://localhost:${devPort}`);
+                    const response = await handler(request);
+                    if (response.status === 404) {
+                        next();
+                        return;
+                    }
+                    await sendResponse(res, response);
+                }
+                catch (err) {
+                    console.error('[hatk]', err.message);
+                    next(err);
+                }
             });
+            // SSR middleware — returned function runs after htmlFallback but before indexHtmlMiddleware
+            return () => {
+                server.middlewares.use(async (req, res, next) => {
+                    if (!ssrGetRenderer?.()) {
+                        next();
+                        return;
+                    }
+                    const accept = req.headers.accept || '';
+                    const url = req.originalUrl || req.url;
+                    if (!accept.includes('text/html') || !url) {
+                        next();
+                        return;
+                    }
+                    try {
+                        const { readFileSync } = await import('node:fs');
+                        const rawHtml = readFileSync(resolve('index.html'), 'utf-8');
+                        const template = await server.transformIndexHtml(url, rawHtml);
+                        const fullUrl = new URL(url, `http://localhost:${devPort}`);
+                        const headers = {};
+                        if (req.headers.cookie)
+                            headers.cookie = req.headers.cookie;
+                        const request = new Request(fullUrl.href, { headers });
+                        // Resolve viewer from session cookie for SSR
+                        // TODO: globalThis.__hatk_viewer is not safe for concurrent SSR requests.
+                        // Replace with AsyncLocalStorage when callXrpc supports per-request context.
+                        let viewer = null;
+                        if (ssrParseSessionCookie) {
+                            try {
+                                viewer = await ssrParseSessionCookie(request);
+                            }
+                            catch { }
+                        }
+                        ;
+                        globalThis.__hatk_viewer = viewer;
+                        let renderedHtml;
+                        try {
+                            renderedHtml = await ssrRenderPage(template, request);
+                        }
+                        finally {
+                            ;
+                            globalThis.__hatk_viewer = null;
+                        }
+                        // Inject viewer into HTML so client has it before OAuth initializes
+                        if (renderedHtml && viewer) {
+                            const script = `<script>globalThis.__hatk_viewer=${JSON.stringify(viewer)}</script>`;
+                            renderedHtml = renderedHtml.replace('</head>', `${script}\n</head>`);
+                        }
+                        if (!renderedHtml) {
+                            next();
+                            return;
+                        }
+                        // Collect CSS from all loaded modules to prevent FOUC
+                        const cssLinks = collectAllCss(server);
+                        let html = renderedHtml;
+                        if (cssLinks) {
+                            html = html.replace('</head>', `${cssLinks}\n</head>`);
+                        }
+                        res.setHeader('Content-Type', 'text/html');
+                        res.end(html);
+                    }
+                    catch (err) {
+                        console.error('[hatk] SSR error:', err.message);
+                        next(err);
+                    }
+                });
+            };
+        },
+        // Handle HMR for server/ files in the hatk environment
+        hotUpdate(options) {
+            if (options.file.includes('/server/') && reloadServer) {
+                // Debounce: hotUpdate fires once per environment, only reload once
+                if (!reloadTimer) {
+                    reloadTimer = setTimeout(() => {
+                        reloadTimer = null;
+                        reloadServer()
+                            .then(() => {
+                            console.log('[hatk] Server handlers reloaded');
+                        })
+                            .catch((err) => {
+                            console.error('[hatk] Failed to reload server handlers:', err.message);
+                        });
+                    }, 50);
+                }
+            }
         },
-        buildEnd() {
-            serverProcess?.kill();
-            serverProcess = null;
+        // Two-stage production build
+        async buildApp(builder) {
+            // Stage 1: Build client
+            if (builder.environments.client) {
+                await builder.build(builder.environments.client);
+            }
+            // Stage 2: Build hatk server (if environment exists)
+            if (builder.environments.hatk) {
+                await builder.build(builder.environments.hatk);
+            }
         },
     };
 }