@hatk/hatk 0.0.1-alpha.9 → 0.0.1-alpha.90

package/dist/{schema.js → database/schema.js}

@@ -1,42 +1,59 @@
 import { readFileSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
+import { DUCKDB_DIALECT } from "./dialect.js";
 // Convert camelCase to snake_case
 export function toSnakeCase(str) {
     return str.replace(/([A-Z])/g, '_$1').toLowerCase();
 }
-function mapType(prop) {
+/**
+ * The columns every generated table carries before any lexicon field. A record
+ * property with one of these names — `fyi.opensocial.space` has a `uri` — would
+ * otherwise produce a CREATE TABLE with a duplicate column and fail at boot.
+ * It is stored under `record_<name>` instead; `originalName` still carries the
+ * lexicon's spelling, which is what every reshaped row is keyed by.
+ */
+const ENVELOPE_COLUMNS = new Set(['uri', 'cid', 'did', 'space', 'indexed_at', 'handle']);
+export function columnName(fieldName) {
+    const snake = toSnakeCase(fieldName);
+    return ENVELOPE_COLUMNS.has(snake) ? `record_${snake}` : snake;
+}
+// Quote a column name to avoid conflicts with SQL reserved words
+export function q(name) {
+    return `"${name}"`;
+}
+function mapType(prop, dialect) {
     if (prop.type === 'string') {
         if (prop.format === 'datetime')
-            return { duckdbType: 'TIMESTAMP', isRef: false };
+            return { sqlType: dialect.typeMap.timestamp, isRef: false, isJson: false };
         if (prop.format === 'at-uri')
-            return { duckdbType: 'TEXT', isRef: true };
-        return { duckdbType: 'TEXT', isRef: false };
+            return { sqlType: dialect.typeMap.text, isRef: true, isJson: false };
+        return { sqlType: dialect.typeMap.text, isRef: false, isJson: false };
     }
     if (prop.type === 'integer')
-        return { duckdbType: 'INTEGER', isRef: false };
+        return { sqlType: dialect.typeMap.integer, isRef: false, isJson: false };
     if (prop.type === 'boolean')
-        return { duckdbType: 'BOOLEAN', isRef: false };
+        return { sqlType: dialect.typeMap.boolean, isRef: false, isJson: false };
     if (prop.type === 'bytes')
-        return { duckdbType: 'BLOB', isRef: false };
+        return { sqlType: dialect.typeMap.blob, isRef: false, isJson: false };
     if (prop.type === 'cid-link')
-        return { duckdbType: 'TEXT', isRef: false };
+        return { sqlType: dialect.typeMap.text, isRef: false, isJson: false };
     if (prop.type === 'array')
-        return { duckdbType: 'JSON', isRef: false };
+        return { sqlType: dialect.jsonType, isRef: false, isJson: true };
     if (prop.type === 'blob')
-        return { duckdbType: 'JSON', isRef: false };
+        return { sqlType: dialect.jsonType, isRef: false, isJson: true };
     if (prop.type === 'union')
-        return { duckdbType: 'JSON', isRef: false };
+        return { sqlType: dialect.jsonType, isRef: false, isJson: true };
     if (prop.type === 'unknown')
-        return { duckdbType: 'JSON', isRef: false };
+        return { sqlType: dialect.jsonType, isRef: false, isJson: true };
     if (prop.type === 'object')
-        return { duckdbType: 'JSON', isRef: false };
+        return { sqlType: dialect.jsonType, isRef: false, isJson: true };
     if (prop.type === 'ref') {
         // strongRef contains { uri, cid } — handled specially in generateTableSchema
         if (prop.ref === 'com.atproto.repo.strongRef')
-            return { duckdbType: 'STRONG_REF', isRef: true };
-        return { duckdbType: 'JSON', isRef: false };
+            return { sqlType: 'STRONG_REF', isRef: true, isJson: false };
+        return { sqlType: dialect.jsonType, isRef: false, isJson: true };
     }
-    return { duckdbType: 'TEXT', isRef: false };
+    return { sqlType: dialect.typeMap.text, isRef: false, isJson: false };
 }
 // Recursively find all .json files in a directory
 function findJsonFiles(dir) {
@@ -63,6 +80,20 @@ export function loadLexicons(lexiconsDir) {
     }
     return lexicons;
 }
+/**
+ * Lexicons the validator cannot model but hatk legitimately keeps.
+ *
+ * A space type is how the indexer learns which collections a space holds, and
+ * a permission set is what an OAuth scope resolves through; both are real
+ * lexicons an app vendors on purpose. `validateLexicons` reports each as an
+ * unknown definition type, which would read as a fatal schema error at boot.
+ * Only these two are set aside — anything else unknown is still a mistake the
+ * validator should refuse.
+ */
+const UNMODELLED_DEF_TYPES = new Set(['space', 'permission-set']);
+export function validatableLexicons(lexicons) {
+    return [...lexicons.values()].filter((lex) => !UNMODELLED_DEF_TYPES.has(lex.defs?.main?.type));
+}
 /**
  * Discover collections by scanning lexicons for record-type definitions.
  */
@@ -121,7 +152,7 @@ function resolveRefDef(ref, defs, lexicons) {
     return lexicons?.get(ref)?.defs?.main || null;
 }
 /** Resolve a single union ref to a branch schema */
-function resolveUnionBranch(ref, collection, fieldName, defs, lexicons) {
+function resolveUnionBranch(ref, collection, fieldName, defs, lexicons, dialect) {
     let branchDef = null;
     let branchName;
     let fullType;
@@ -153,7 +184,10 @@ function resolveUnionBranch(ref, collection, fieldName, defs, lexicons) {
     let arrayField;
     let wrapperField;
     let propSource = branchDef.properties;
-    const branchRequired = new Set(branchDef.required || []);
+    // `required` has to travel with propSource: once the columns come from the
+    // item (or wrapper target) def, the outer branch's `required` describes the
+    // wrapper property, not these columns.
+    let branchRequired = new Set(branchDef.required || []);
     // Check for single-property wrapper patterns
     const propEntries = Object.entries(branchDef.properties);
     if (propEntries.length === 1) {
@@ -166,6 +200,7 @@ function resolveUnionBranch(ref, collection, fieldName, defs, lexicons) {
                 isArray = true;
                 arrayField = onlyField;
                 propSource = itemDef.properties;
+                branchRequired = new Set(itemDef.required || []);
             }
         }
         else if (onlyProp.type === 'ref' && onlyProp.ref) {
@@ -174,6 +209,7 @@ function resolveUnionBranch(ref, collection, fieldName, defs, lexicons) {
             if (refDef?.type === 'object' && refDef.properties) {
                 wrapperField = onlyField;
                 propSource = refDef.properties;
+                branchRequired = new Set(refDef.required || []);
             }
         }
     }
@@ -181,21 +217,22 @@ function resolveUnionBranch(ref, collection, fieldName, defs, lexicons) {
     const tableName = `"${collection}__${snakeField}_${branchName}"`;
     const columns = [];
     for (const [propName, prop] of Object.entries(propSource)) {
-        const { duckdbType, isRef } = mapType(prop);
+        const { sqlType, isRef, isJson } = mapType(prop, dialect);
         // Skip STRONG_REF expansion in branch tables — treat as JSON
-        const finalType = duckdbType === 'STRONG_REF' ? 'JSON' : duckdbType;
+        const finalType = sqlType === 'STRONG_REF' ? dialect.jsonType : sqlType;
         columns.push({
             name: toSnakeCase(propName),
             originalName: propName,
-            duckdbType: finalType,
+            sqlType: finalType,
             notNull: branchRequired.has(propName),
-            isRef: finalType !== 'JSON' && isRef,
+            isRef: finalType !== dialect.jsonType && isRef,
+            isJson: isJson || sqlType === 'STRONG_REF',
         });
     }
     return { type: fullType, branchName, tableName, columns, isArray, arrayField, wrapperField };
 }
 // Generate a TableSchema from a lexicon record definition
-export function generateTableSchema(nsid, lexicon, lexicons) {
+export function generateTableSchema(nsid, lexicon, lexicons, dialect = DUCKDB_DIALECT) {
     const mainDef = lexicon.defs?.main;
     if (!mainDef || mainDef.type !== 'record') {
         throw new Error(`Lexicon ${nsid} does not define a record type`);
@@ -214,7 +251,7 @@ export function generateTableSchema(nsid, lexicon, lexicons) {
         if (p.type === 'union' && p.refs) {
             const branches = [];
             for (const ref of p.refs) {
-                const branch = resolveUnionBranch(ref, nsid, fieldName, lexicon.defs, lexicons);
+                const branch = resolveUnionBranch(ref, nsid, fieldName, lexicon.defs, lexicons, dialect);
                 if (branch)
                     branches.push(branch);
             }
@@ -223,11 +260,12 @@ export function generateTableSchema(nsid, lexicon, lexicons) {
             }
             // Still add the JSON column for the raw union value
             columns.push({
-                name: toSnakeCase(fieldName),
+                name: columnName(fieldName),
                 originalName: fieldName,
-                duckdbType: 'JSON',
+                sqlType: dialect.jsonType,
                 notNull: required.has(fieldName),
                 isRef: false,
+                isJson: true,
             });
             continue;
         }
@@ -238,13 +276,14 @@ export function generateTableSchema(nsid, lexicon, lexicons) {
                 const childColumns = [];
                 const itemRequired = new Set(p.items?.required || lexicon.defs?.[p.items?.ref?.slice(1)]?.required || []);
                 for (const [itemField, itemProp] of Object.entries(itemProps)) {
-                    const { duckdbType, isRef } = mapType(itemProp);
+                    const { sqlType, isRef, isJson } = mapType(itemProp, dialect);
                     childColumns.push({
                         name: toSnakeCase(itemField),
                         originalName: itemField,
-                        duckdbType,
+                        sqlType,
                         notNull: itemRequired.has(itemField),
                         isRef,
+                        isJson,
                     });
                 }
                 const snakeField = toSnakeCase(fieldName);
@@ -257,31 +296,34 @@ export function generateTableSchema(nsid, lexicon, lexicons) {
                 continue;
             }
         }
-        const { duckdbType, isRef } = mapType(p);
-        if (duckdbType === 'STRONG_REF') {
+        const { sqlType, isRef, isJson } = mapType(p, dialect);
+        if (sqlType === 'STRONG_REF') {
             // Expand strongRef into two columns: {name}_uri and {name}_cid
             columns.push({
                 name: toSnakeCase(fieldName) + '_uri',
                 originalName: fieldName,
-                duckdbType: 'TEXT',
+                sqlType: dialect.typeMap.text,
                 notNull: required.has(fieldName),
                 isRef: true,
+                isJson: false,
             });
             columns.push({
                 name: toSnakeCase(fieldName) + '_cid',
                 originalName: fieldName + '__cid',
-                duckdbType: 'TEXT',
+                sqlType: dialect.typeMap.text,
                 notNull: required.has(fieldName),
                 isRef: false,
+                isJson: false,
             });
         }
         else {
             columns.push({
-                name: toSnakeCase(fieldName),
+                name: columnName(fieldName),
                 originalName: fieldName,
-                duckdbType,
+                sqlType,
                 notNull: required.has(fieldName),
                 isRef,
+                isJson,
             });
         }
     }
@@ -296,26 +338,35 @@ export function generateTableSchema(nsid, lexicon, lexicons) {
     };
 }
 // Generate CREATE TABLE SQL from a TableSchema
-export function generateCreateTableSQL(schema) {
+export function generateCreateTableSQL(schema, dialect = DUCKDB_DIALECT) {
+    // `space` is the permissioned space a row came from, and NULL for everything
+    // off the firehose. It is the only per-row visibility marker in the schema:
+    // a space record is readable by whoever the space's authority admits, so no
+    // read may serve one without knowing who is asking. NULL means "public repo
+    // data", which is what every existing row is.
     const lines = [
         '  uri TEXT PRIMARY KEY',
         '  cid TEXT',
         '  did TEXT NOT NULL',
-        '  indexed_at TIMESTAMP NOT NULL',
+        '  space TEXT',
+        `  indexed_at ${dialect.timestampType} NOT NULL`,
     ];
     for (const col of schema.columns) {
         const nullable = col.notNull ? ' NOT NULL' : '';
-        lines.push(`  ${col.name} ${col.duckdbType}${nullable}`);
+        lines.push(`  ${q(col.name)} ${col.sqlType}${nullable}`);
     }
     const createTable = `CREATE TABLE IF NOT EXISTS ${schema.tableName} (\n${lines.join(',\n')}\n);`;
     const prefix = schema.collection.replace(/\./g, '_');
     const indexes = [
         `CREATE INDEX IF NOT EXISTS idx_${prefix}_indexed ON ${schema.tableName}(indexed_at DESC);`,
         `CREATE INDEX IF NOT EXISTS idx_${prefix}_author ON ${schema.tableName}(did);`,
+        // Every read that serves space rows filters on this column, and every read
+        // that does not still tests it for NULL.
+        `CREATE INDEX IF NOT EXISTS idx_${prefix}_space ON ${schema.tableName}(space);`,
     ];
     // Index ref columns for hydration lookups
     for (const refCol of schema.refColumns) {
-        indexes.push(`CREATE INDEX IF NOT EXISTS idx_${prefix}_${refCol} ON ${schema.tableName}(${refCol});`);
+        indexes.push(`CREATE INDEX IF NOT EXISTS idx_${prefix}_${refCol} ON ${schema.tableName}(${q(refCol)});`);
     }
     // Child table DDL
     const childDDL = [];
@@ -323,16 +374,16 @@ export function generateCreateTableSQL(schema) {
         const childLines = ['  parent_uri TEXT NOT NULL', '  parent_did TEXT NOT NULL'];
         for (const col of child.columns) {
             const nullable = col.notNull ? ' NOT NULL' : '';
-            childLines.push(`  ${col.name} ${col.duckdbType}${nullable}`);
+            childLines.push(`  ${q(col.name)} ${col.sqlType}${nullable}`);
         }
         childDDL.push(`CREATE TABLE IF NOT EXISTS ${child.tableName} (\n${childLines.join(',\n')}\n);`);
         const childPrefix = `${prefix}__${toSnakeCase(child.fieldName)}`;
         childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${childPrefix}_parent ON ${child.tableName}(parent_uri);`);
         childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${childPrefix}_did ON ${child.tableName}(parent_did);`);
         for (const col of child.columns) {
-            if (col.duckdbType === 'JSON' || col.duckdbType === 'BLOB')
+            if (col.isJson || col.sqlType === 'BLOB')
                 continue;
-            childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${childPrefix}_${col.name} ON ${child.tableName}(${col.name});`);
+            childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${childPrefix}_${col.name} ON ${child.tableName}(${q(col.name)});`);
         }
     }
     // Union branch table DDL
@@ -341,18 +392,49 @@ export function generateCreateTableSQL(schema) {
             const branchLines = ['  parent_uri TEXT NOT NULL', '  parent_did TEXT NOT NULL'];
             for (const col of branch.columns) {
                 const nullable = col.notNull ? ' NOT NULL' : '';
-                branchLines.push(`  ${col.name} ${col.duckdbType}${nullable}`);
+                branchLines.push(`  ${q(col.name)} ${col.sqlType}${nullable}`);
             }
             childDDL.push(`CREATE TABLE IF NOT EXISTS ${branch.tableName} (\n${branchLines.join(',\n')}\n);`);
             const branchPrefix = branch.tableName.replace(/"/g, '').replace(/\./g, '_');
             childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${branchPrefix}_parent ON ${branch.tableName}(parent_uri);`);
             childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${branchPrefix}_did ON ${branch.tableName}(parent_did);`);
             for (const col of branch.columns) {
-                if (col.duckdbType === 'JSON' || col.duckdbType === 'BLOB')
+                if (col.isJson || col.sqlType === 'BLOB')
                     continue;
-                childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${branchPrefix}_${col.name} ON ${branch.tableName}(${col.name});`);
+                childDDL.push(`CREATE INDEX IF NOT EXISTS idx_${branchPrefix}_${col.name} ON ${branch.tableName}(${q(col.name)});`);
             }
         }
     }
     return [createTable, ...indexes, ...childDDL].join('\n');
 }
+/**
+ * Build table schemas and DDL from lexicons and collections.
+ * Shared by main.ts (server boot) and cli.ts (hatk schema command).
+ */
+export function buildSchemas(lexicons, collections, dialect = DUCKDB_DIALECT) {
+    const schemas = [];
+    const ddlStatements = [];
+    for (const nsid of collections) {
+        const lexicon = lexicons.get(nsid);
+        if (!lexicon) {
+            const genericDDL = `CREATE TABLE IF NOT EXISTS "${nsid}" (
+      uri TEXT PRIMARY KEY,
+      cid TEXT,
+      did TEXT NOT NULL,
+      space TEXT,
+      indexed_at ${dialect.timestampType} NOT NULL,
+      data ${dialect.jsonType}
+    );
+    CREATE INDEX IF NOT EXISTS idx_${nsid.replace(/\./g, '_')}_indexed ON "${nsid}"(indexed_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_${nsid.replace(/\./g, '_')}_author ON "${nsid}"(did);
+    CREATE INDEX IF NOT EXISTS idx_${nsid.replace(/\./g, '_')}_space ON "${nsid}"(space);`;
+            schemas.push({ collection: nsid, tableName: `"${nsid}"`, columns: [], refColumns: [], children: [], unions: [] });
+            ddlStatements.push(genericDDL);
+            continue;
+        }
+        const schema = generateTableSchema(nsid, lexicon, lexicons, dialect);
+        schemas.push(schema);
+        ddlStatements.push(generateCreateTableSQL(schema, dialect));
+    }
+    return { schemas, ddlStatements };
+}

package/dist/dev-entry.d.ts

@@ -0,0 +1,8 @@
+export declare const handler: (request: Request) => Promise<Response>;
+/** Re-scan server/ directory to pick up changed handlers in dev mode. */
+export declare function reloadServer(): Promise<void>;
+export { renderPage } from './renderer.ts';
+export { getRenderer } from './renderer.ts';
+export { callXrpc } from './xrpc.ts';
+export { parseSessionCookie, getSessionCookieName } from './oauth/session.ts';
+//# sourceMappingURL=dev-entry.d.ts.map

package/dist/dev-entry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-entry.d.ts","sourceRoot":"","sources":["../src/dev-entry.ts"],"names":[],"mappings":"AAiIA,eAAO,MAAM,OAAO,yCAKlB,CAAA;AAEF,yEAAyE;AACzE,wBAAsB,YAAY,kBAEjC;AAED,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/dev-entry.js

@@ -0,0 +1,127 @@
+/**
+ * Dev mode entry point — loaded through Vite's module runner.
+ * Boots hatk infrastructure and exports the fetch handler.
+ */
+import { loadConfig } from "./config.js";
+import { validatableLexicons, loadLexicons, storeLexicons, discoverCollections, buildSchemas, } from "./database/schema.js";
+import { discoverViews } from "./views.js";
+import { initDatabase, migrateSchema, getSchemaDump } from "./database/db.js";
+import { createAdapter } from "./database/adapter-factory.js";
+import { getDialect } from "./database/dialect.js";
+import { setSearchPort } from "./database/fts.js";
+import { configureRelay, configureCdn, configureOAuth } from "./xrpc.js";
+import { initOAuth } from "./oauth/server.js";
+import { initServer } from "./server-init.js";
+import { createHandler, registerCoreHandlers } from "./server.js";
+import { setPrivateCollections } from "./private-collections.js";
+import { auxCursorKey, startAuxIndexer, startIndexer, sweepReferences } from "./indexer.js";
+import { getCursor } from "./database/db.js";
+import { runBackfill, configurePlc } from "./backfill.js";
+import { rebuildAllIndexes } from "./database/fts.js";
+import { relayHttpUrl } from "./config.js";
+import { validateLexicons } from '@bigmoves/lexicon';
+import { log } from "./logger.js";
+import { mkdirSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+process.env.DEV_MODE = '1';
+// Boot sequence (mirrors main.ts but exports handler instead of starting server)
+const configPath = 'hatk.config.ts';
+const configDir = dirname(resolve(configPath));
+const config = await loadConfig(configPath);
+configureRelay(config.relay);
+configurePlc(config.plc);
+configureCdn(config.cdn);
+const lexicons = loadLexicons(resolve(configDir, 'lexicons'));
+const lexiconErrors = validateLexicons(validatableLexicons(lexicons));
+if (lexiconErrors) {
+    for (const [nsid, errors] of Object.entries(lexiconErrors)) {
+        for (const err of errors)
+            console.error(`Invalid lexicon ${nsid}: ${err}`);
+    }
+    throw new Error('Invalid lexicons');
+}
+storeLexicons(lexicons);
+const collections = config.collections.length > 0 ? config.collections : discoverCollections(lexicons);
+discoverViews();
+const engineDialect = getDialect(config.databaseEngine);
+const { schemas, ddlStatements } = buildSchemas(lexicons, collections, engineDialect);
+if (config.database !== ':memory:') {
+    mkdirSync(dirname(config.database), { recursive: true });
+}
+const { adapter, searchPort } = await createAdapter(config.databaseEngine);
+setSearchPort(searchPort);
+await initDatabase(adapter, config.database, schemas, ddlStatements);
+await migrateSchema(schemas);
+// Write db/schema.sql
+try {
+    const { mkdirSync, writeFileSync } = await import('node:fs');
+    const schemaDir = resolve(configDir, 'db');
+    mkdirSync(schemaDir, { recursive: true });
+    const schemaDump = await getSchemaDump();
+    writeFileSync(resolve(schemaDir, 'schema.sql'), `-- This file is auto-generated by hatk on startup. Do not edit.\n-- Database engine: ${config.databaseEngine}\n\n${schemaDump}\n`);
+    log(`[hatk] Schema written to db/schema.sql`);
+}
+catch { }
+// Initialize handlers from server/ directory
+await initServer(resolve(configDir, 'server'));
+// Register built-in dev.hatk.* handlers so callXrpc() can find them
+setPrivateCollections(config.privateCollections);
+registerCoreHandlers(collections, config.oauth);
+configureOAuth(config.oauth);
+if (config.oauth) {
+    await initOAuth(config.oauth, config.plc, config.relay);
+}
+// Start indexer
+const collectionSet = new Set(collections);
+// Same escape hatch as main.ts: boot from live instead of the saved cursor.
+const ignoreSavedCursor = Boolean(process.env.HATK_IGNORE_SAVED_CURSOR);
+if (ignoreSavedCursor)
+    log('[dev] HATK_IGNORE_SAVED_CURSOR set — starting indexer from live');
+const cursor = ignoreSavedCursor ? null : await getCursor('relay');
+startIndexer({
+    relayUrl: config.relay,
+    plcUrl: config.plc,
+    collections: collectionSet,
+    signalCollections: config.backfill.signalCollections ? new Set(config.backfill.signalCollections) : undefined,
+    references: config.backfill.references,
+    pinnedRepos: config.backfill.repos ? new Set(config.backfill.repos) : undefined,
+    cursor,
+    fetchTimeout: config.backfill.fetchTimeout,
+    maxRetries: config.backfill.maxRetries,
+    parallelism: config.backfill.parallelism,
+    ftsRebuildInterval: config.ftsRebuildInterval,
+});
+void sweepReferences();
+for (const relayUrl of config.relays) {
+    const auxCursor = ignoreSavedCursor ? null : await getCursor(auxCursorKey(relayUrl));
+    startAuxIndexer({ relayUrl, collections: collectionSet, cursor: auxCursor });
+}
+// Run backfill in background (no restart in dev mode)
+runBackfill({
+    pdsUrl: relayHttpUrl(config.relay),
+    extraPdsUrls: config.relays.map(relayHttpUrl),
+    plcUrl: config.plc,
+    collections: collectionSet,
+    config: config.backfill,
+})
+    .then(() => rebuildAllIndexes(Array.from(collectionSet)))
+    .catch((err) => console.error('[backfill]', err.message));
+// Export the handler for Vite middleware
+export const handler = createHandler({
+    collections: Array.from(collectionSet),
+    publicDir: null, // Vite serves static assets in dev
+    oauth: config.oauth,
+    admins: config.admins,
+});
+/** Re-scan server/ directory to pick up changed handlers in dev mode. */
+export async function reloadServer() {
+    await initServer(resolve(configDir, 'server'));
+}
+export { renderPage } from "./renderer.js";
+export { getRenderer } from "./renderer.js";
+export { callXrpc } from "./xrpc.js";
+export { parseSessionCookie, getSessionCookieName } from "./oauth/session.js";
+log(`[hatk] Dev server ready`);
+log(`  Relay: ${config.relay}${config.relays.length ? ` (+ ${config.relays.join(', ')})` : ''}`);
+log(`  Database: ${config.database}`);
+log(`  Collections: ${collections.join(', ')}`);

package/dist/feeds.d.ts

@@ -1,6 +1,6 @@
-import type { HydrateContext, Row } from './hydrate.ts';
+import type { BaseContext, Row } from './hydrate.ts';
 import type { Checked } from './lex-types.ts';
-export type { HydrateContext, Row };
+export type { BaseContext, Row };
 export interface FeedResult {
     uris: string[];
     cursor?: string;
@@ -16,7 +16,9 @@ export interface PaginateResult<T> {
 }
 export interface FeedContext {
     db: {
-        query: (sql: string, params?: any[]) => Promise<any[]>;
+        query: (sql: string, params?: unknown[]) => Promise<unknown[]>;
+        /** Raw SQL with the permissioned-space guard off. See `spaces/guard.ts`. */
+        unfiltered: (sql: string, params?: unknown[]) => Promise<unknown[]>;
     };
     params: Record<string, string>;
     cursor?: string;
@@ -34,6 +36,18 @@ export interface FeedContext {
     paginate: <T extends {
         uri: string;
     }>(sql: string, opts?: PaginateOpts) => Promise<PaginateResult<T>>;
+    /**
+     * The permissioned-space gate, for SQL this feed builds without `paginate`.
+     *
+     * `paginate` applies it already. This is for a feed that runs its own query
+     * — a raw `ctx.db.query` over a record table has to carry it, or it serves
+     * space rows to whoever asks. See `spaceFilterSql`.
+     */
+    spaceFilter: (alias: string, startIdx: number) => {
+        sql: string;
+        params: string[];
+        nextIdx: number;
+    };
 }
 type FeedGenerate = (ctx: FeedContext & {
     ok: (value: FeedResult) => Checked<FeedResult>;
@@ -43,17 +57,17 @@ type FeedOpts = {
     view?: string;
     label: string;
     generate: FeedGenerate;
-    hydrate?: (ctx: HydrateContext<any>) => Promise<unknown[]>;
+    hydrate?: (ctx: BaseContext, items: Row<any>[]) => Promise<unknown[]>;
 } | {
     collection?: never;
     view?: never;
     label: string;
     generate: FeedGenerate;
-    hydrate: (ctx: HydrateContext<any>) => Promise<unknown[]>;
+    hydrate: (ctx: BaseContext, items: Row<any>[]) => Promise<unknown[]>;
 };
 export declare function createPaginate(deps: {
     db: {
-        query: (sql: string, params?: any[]) => Promise<any[]>;
+        query: (sql: string, params?: unknown[]) => Promise<unknown[]>;
     };
     cursor?: string;
     limit: number;
@@ -70,14 +84,18 @@ export declare function defineFeed(opts: FeedOpts): {
     collection: string;
     view?: string;
     label: string;
-    hydrate?: (ctx: HydrateContext<any>) => Promise<unknown[]>;
+    hydrate?: (ctx: BaseContext, items: Row<any>[]) => Promise<unknown[]>;
+    __type: "feed";
 } | {
     generate: (ctx: any) => Promise<Checked<FeedResult>>;
     collection?: never;
     view?: never;
     label: string;
-    hydrate: (ctx: HydrateContext<any>) => Promise<unknown[]>;
+    hydrate: (ctx: BaseContext, items: Row<any>[]) => Promise<unknown[]>;
+    __type: "feed";
 };
+/** Register a single feed from a scanned server/ module. */
+export declare function registerFeed(name: string, generator: ReturnType<typeof defineFeed>): void;
 export declare function initFeeds(feedsDir: string): Promise<void>;
 /** Execute a feed and run its hydrate pipeline if present. */
 export declare function executeFeed(name: string, params: Record<string, string>, cursor: string | undefined, limit: number, viewer?: {

package/dist/feeds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../src/feeds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../src/feeds.ts"],"names":[],"mappings":"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"}