chore: tighten EmDash core and adapter type safety

Made-with: Cursor

Author: vidarbrekke

packages/auth/src/adapters/kysely.ts

@@ -93,9 +93,8 @@ interface AllowedDomainTable {
 // ============================================================================
 
 export function createKyselyAdapter<T extends AuthTables>(db: Kysely<T>): AuthAdapter {
-	// Type cast to work with generic Kysely instance
-	// eslint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- generic Kysely<T extends AuthTables> narrowed to concrete AuthTables for internal queries
-	const kdb = db as unknown as Kysely<AuthTables>;
+	// `Kysely` is structurally compatible at runtime with the subset this adapter reads/writes.
+	const kdb = db as Kysely<AuthTables>;
 
 	return {
 		// ========================================================================

packages/cloudflare/src/db/d1-introspector.ts

@@ -7,29 +7,25 @@
  * This introspector queries tables individually instead.
  */
 
-import type { DatabaseIntrospector, DatabaseMetadata, SchemaMetadata, TableMetadata } from "kysely";
+import type { DatabaseIntrospector, DatabaseMetadata, Kysely, SchemaMetadata, TableMetadata } from "kysely";
 import { sql } from "kysely";
 
 // Kysely's default migration table names
 const DEFAULT_MIGRATION_TABLE = "kysely_migration";
 const DEFAULT_MIGRATION_LOCK_TABLE = "kysely_migration_lock";
 
-// Kysely's DatabaseIntrospector.createIntrospector receives Kysely<any>.
-// We must use `any` here to match Kysely's own interface contract —
-// it needs untyped schema access to query sqlite_master dynamically.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AnyKysely = any;
+type IntrospectorShape = Record<string, Record<string, unknown>>;
 
 // Regex patterns for parsing CREATE TABLE statements
 const SPLIT_PARENS_PATTERN = /[(),]/;
 const WHITESPACE_PATTERN = /\s+/;
 const QUOTES_PATTERN = /["`]/g;
 
-export class D1Introspector implements DatabaseIntrospector {
-	readonly #db: AnyKysely;
+export class D1Introspector<DB extends object = IntrospectorShape> implements DatabaseIntrospector {
+	readonly #db: Kysely<DB & IntrospectorShape>;
 
-	constructor(db: AnyKysely) {
-		this.#db = db;
+	constructor(db: Kysely<DB>) {
+		this.#db = db as Kysely<DB & IntrospectorShape>;
 	}
 
 	async getSchemas(): Promise<SchemaMetadata[]> {

packages/cloudflare/src/db/d1.ts

@@ -12,6 +12,7 @@ import { env } from "cloudflare:workers";
 import type { DatabaseIntrospector, Dialect, Kysely } from "kysely";
 import { D1Dialect } from "kysely-d1";
 
+import type { Database } from "emdash";
 import { D1Introspector } from "./d1-introspector.js";
 
 /**
@@ -30,7 +31,7 @@ interface D1Config {
  * cross-join with pragma_table_info() that D1 doesn't allow.
  */
 class EmDashD1Dialect extends D1Dialect {
-	override createIntrospector(db: Kysely<any>): DatabaseIntrospector {
+	override createIntrospector(db: Kysely<Database>): DatabaseIntrospector {
 		return new D1Introspector(db);
 	}
 }

packages/cloudflare/src/db/do-dialect.ts

@@ -16,6 +16,7 @@ import type {
 } from "kysely";
 import { SqliteAdapter, SqliteQueryCompiler } from "kysely";
 
+import type { Database } from "emdash";
 import { D1Introspector } from "./d1-introspector.js";
 import type { QueryResult as DOQueryResult } from "./do-class.js";
 
@@ -62,7 +63,7 @@ export class PreviewDODialect implements Dialect {
 		return new SqliteQueryCompiler();
 	}
 
-	createIntrospector(db: Kysely<any>): DatabaseIntrospector {
+	createIntrospector(db: Kysely<Database>): DatabaseIntrospector {
 		return new D1Introspector(db);
 	}
 }

packages/cloudflare/src/db/do-preview.ts

@@ -26,6 +26,7 @@ import { runWithContext } from "emdash/request-context";
 import { Kysely } from "kysely";
 import { ulid } from "ulidx";
 
+import type { Database } from "emdash";
 import type { EmDashPreviewDB } from "./do-class.js";
 import { PreviewDODialect } from "./do-dialect.js";
 import type { PreviewDBStub } from "./do-dialect.js";
@@ -221,13 +222,12 @@ export function createPreviewMiddleware(config: PreviewMiddlewareConfig): Middle
 		// --- 4. Create Kysely dialect pointing at the DO ---
 		const getStub = (): PreviewDBStub => {
 			// eslint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- RPC type limitation
-			return stub as unknown as PreviewDBStub;
+			return stub as PreviewDBStub;
 		};
 		const dialect = new PreviewDODialect({ getStub });
 
 		// --- 5. Create Kysely instance and override request-context DB ---
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		const previewDb = new Kysely<any>({ dialect });
+	const previewDb = new Kysely<Database>({ dialect });
 
 		return runWithContext(
 			{

packages/cloudflare/src/db/do.ts

@@ -48,7 +48,7 @@ export function createDialect(config: PreviewDOConfig & { name: string }): Diale
 	const getStub = (): PreviewDBStub => {
 		const stub = namespace.get(id);
 		// eslint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- Rpc type limitation with unknown in return types
-		return stub as unknown as PreviewDBStub;
+		return stub as PreviewDBStub;
 	};
 
 	return new PreviewDODialect({ getStub });

packages/cloudflare/src/db/playground-middleware.ts

@@ -20,6 +20,7 @@ import { ulid } from "ulidx";
 // @ts-ignore - virtual module populated by EmDash integration at build time
 import virtualConfig from "virtual:emdash/config";
 
+import type { Database } from "emdash";
 import type { EmDashPreviewDB } from "./do-class.js";
 import { PreviewDODialect } from "./do-dialect.js";
 import type { PreviewDBStub } from "./do-dialect.js";
@@ -80,7 +81,7 @@ function getStub(binding: string, token: string): PreviewDBStub {
 	const doId = namespace.idFromName(token);
 	const stub = namespace.get(doId);
 	// eslint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- RPC type limitation
-	return stub as unknown as PreviewDBStub;
+	return stub as PreviewDBStub;
 }
 
 /**
@@ -119,8 +120,7 @@ function getSessionCreatedAt(token: string): string {
  * Initialize a playground DO: run migrations, apply seed, create admin user.
  */
 async function initializePlayground(
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	db: Kysely<any>,
+	db: Kysely<Database>,
 	token: string,
 ): Promise<void> {
 	// Check if already initialized (persisted in the DO)
@@ -288,7 +288,7 @@ export const onRequest = defineMiddleware(async (context, next) => {
 		const stub = getStub(binding, token);
 		const dialect = new PreviewDODialect({ getStub: () => stub });
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		const db = new Kysely<any>({ dialect });
+	const db = new Kysely<Database>({ dialect });
 
 		try {
 			await initializePlayground(db, token);
@@ -334,7 +334,7 @@ export const onRequest = defineMiddleware(async (context, next) => {
 	const stub = getStub(binding, token);
 	const dialect = new PreviewDODialect({ getStub: () => stub });
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	const db = new Kysely<any>({ dialect });
+	const db = new Kysely<Database>({ dialect });
 
 	// Ensure initialized
 	if (!initializedSessions.has(token)) {

packages/cloudflare/src/plugins/vectorize-search.ts

@@ -45,6 +45,8 @@
 import type { PluginDefinition, PluginContext, RouteContext, ContentHookEvent } from "emdash";
 import { extractPlainText } from "emdash";
 
+const ASTRO_LOCALS_SYMBOL = Symbol.for("astro.locals");
+
 /** Safely extract a string from an unknown value */
 function toString(value: unknown): string {
 	return typeof value === "string" ? value : "";
@@ -55,6 +57,27 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 	return value != null && typeof value === "object" && !Array.isArray(value);
 }
 
+interface AstroRequestLocals {
+	runtime?: {
+		env?: CloudflareEnv;
+	};
+}
+
+interface PortableTextLikeBlock {
+	_type: string;
+	[key: string]: unknown;
+}
+
+function isPortableTextLikeArray(value: unknown[]): value is PortableTextLikeBlock[] {
+	return value.every(
+		(item) =>
+			item !== null &&
+			typeof item === "object" &&
+			"_type" in item &&
+			typeof (item as { _type?: unknown })._type === "string",
+	);
+}
+
 /**
  * Vectorize Search Plugin Configuration
  */
@@ -84,8 +107,7 @@ export interface VectorizeSearchConfig {
 function getCloudflareEnv(request: Request): CloudflareEnv | null {
 	// Access runtime.env from Astro's Cloudflare adapter
 	// This is available when running on Cloudflare Workers
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any, typescript-eslint(no-unsafe-type-assertion) -- Astro locals accessed via internal symbol; no typed API available
-	const locals = (request as any)[Symbol.for("astro.locals")];
+	const locals = (request as { [ASTRO_LOCALS_SYMBOL]?: AstroRequestLocals })[ASTRO_LOCALS_SYMBOL];
 	if (locals?.runtime?.env) {
 		return locals.runtime.env;
 	}
@@ -112,9 +134,7 @@ function extractSearchableText(content: Record<string, unknown>): string {
 			const text = extractPlainText(value);
 			if (text) parts.push(text);
 		} else if (Array.isArray(value)) {
-			// Assume Portable Text array
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any, typescript-eslint(no-unsafe-type-assertion) -- Portable Text arrays are untyped at this point; extractPlainText handles validation
-			const text = extractPlainText(value as any);
+			const text = isPortableTextLikeArray(value) ? extractPlainText(value) : JSON.stringify(value);
 			if (text) parts.push(text);
 		}
 	}

packages/cloudflare/tests/db/playground-dialect.test.ts

@@ -1,5 +1,6 @@
 import { Kysely } from "kysely";
 import { describe, it, expect } from "vitest";
+import type { Database } from "emdash";
 
 import { PreviewDODialect } from "../../src/db/do-dialect.js";
 import type { PreviewDBStub } from "../../src/db/do-dialect.js";
@@ -32,7 +33,7 @@ describe("playground dummy dialect", () => {
 
 	it("throws when a query is executed (no middleware ALS override)", async () => {
 		const dialect = createTestDialect();
-		const db = new Kysely<any>({ dialect });
+		const db = new Kysely<Database>({ dialect });
 
 		await expect(
 			db

packages/core/src/api/handlers/marketplace.ts

@@ -241,10 +241,7 @@ export async function loadBundleFromR2(
 		const parsed: unknown = JSON.parse(manifestText);
 		const result = pluginManifestSchema.safeParse(parsed);
 		if (!result.success) return null;
-		// Elements are validated as unknown[] by Zod; cast to PluginManifest
-		// for the Element[] type (Block Kit validation happens at render time).
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Zod types elements as unknown[]; Element type validated at render time
-		const manifest = result.data as unknown as PluginManifest;
+		const manifest = result.data;
 
 		// Try to load admin code (optional)
 		let adminCode: string | undefined;