@gscdump/engine-sqlite 2.0.1 → 2.0.3

package/dist/r2-manifest-store.d.mts

@@ -1,11 +1,14 @@
 import { r2Locks, r2Manifest, r2SyncStates, r2Watermarks } from "./r2-manifest-schema.mjs";
+import { ExtractTablesWithRelations, Schema } from "drizzle-orm/relations";
 import { ManifestStore } from "@gscdump/engine";
 import { DrizzleD1Database } from "drizzle-orm/d1";
-type AnalyticsManifestDb = DrizzleD1Database<{
+interface AnalyticsManifestSchema extends Schema {
   r2Manifest: typeof r2Manifest;
   r2Locks: typeof r2Locks;
   r2SyncStates: typeof r2SyncStates;
   r2Watermarks: typeof r2Watermarks;
-}>;
+}
+type AnalyticsManifestRelations = ExtractTablesWithRelations<Record<string, never>, AnalyticsManifestSchema>;
+type AnalyticsManifestDb = DrizzleD1Database<AnalyticsManifestRelations>;
 declare function createD1ManifestStore(db: AnalyticsManifestDb): ManifestStore;
 export { AnalyticsManifestDb, createD1ManifestStore };

package/dist/runner.d.mts

@@ -1,7 +1,9 @@
-import { Schema } from "./schema.mjs";
+import { Schema as Schema$1 } from "./schema.mjs";
 import { SQL } from "drizzle-orm";
 import { ScopedRunnerOptions, TableScope } from "@gscdump/engine/scope";
+import { ExtractTablesWithRelations, Schema } from "drizzle-orm/relations";
 import { SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy";
+type SchemaRelations<TSchema extends Schema> = ExtractTablesWithRelations<Record<string, never>, TSchema>;
 declare function compileSqlite(query: SQL): {
   sql: string;
   params: unknown[];
@@ -9,7 +11,7 @@ declare function compileSqlite(query: SQL): {
 type SqliteRowExecutor = (sql: string, params: unknown[], method: 'run' | 'all' | 'values' | 'get') => Promise<{
   rows: unknown[];
 }>;
-interface SqliteInsightRunnerOptions<TSchema extends Record<string, unknown> = Schema> {
+interface SqliteInsightRunnerOptions<TSchema extends Schema = Schema$1> {
   executor: SqliteRowExecutor;
   logger?: boolean;
   /**
@@ -25,10 +27,10 @@ interface SqliteInsightRunnerOptions<TSchema extends Record<string, unknown> = S
    */
   schema?: TSchema;
 }
-interface SqliteInsightRunner<TSchema extends Record<string, unknown> = Schema> {
-  db: SqliteRemoteDatabase<TSchema>;
+interface SqliteInsightRunner<TSchema extends Schema = Schema$1> {
+  db: SqliteRemoteDatabase<SchemaRelations<TSchema>>;
 }
-declare function createSqliteInsightRunner<TSchema extends Record<string, unknown> = Schema>(opts: SqliteInsightRunnerOptions<TSchema>): SqliteInsightRunner<TSchema>;
+declare function createSqliteInsightRunner<TSchema extends Schema = Schema$1>(opts: SqliteInsightRunnerOptions<TSchema>): SqliteInsightRunner<TSchema>;
 declare const scopeFor: (table: "gsc_pages" | "gsc_keywords" | "gsc_countries" | "gsc_devices" | "gsc_page_keywords" | "gsc_search_appearance" | "gsc_search_appearance_pages" | "gsc_search_appearance_queries" | "gsc_search_appearance_page_queries" | "gsc_hourly_pages" | "gsc_query_dim", opts: ScopedRunnerOptions) => TableScope;
 declare const mergeScope: typeof import("@gscdump/engine/scope").mergeScope;
 export { type ScopedRunnerOptions, SqliteInsightRunner, SqliteInsightRunnerOptions, SqliteRowExecutor, type TableScope, compileSqlite, createSqliteInsightRunner, mergeScope, scopeFor };

package/dist/runner.mjs

@@ -1,8 +1,9 @@
 import { schema } from "./schema.mjs";
 import { createScopedHelpers } from "@gscdump/engine/scope";
-import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
+import { buildRelations } from "drizzle-orm/relations";
+import { SQLiteDialect } from "drizzle-orm/sqlite-core";
 import { drizzle } from "drizzle-orm/sqlite-proxy";
-const sqliteDialect = new SQLiteAsyncDialect();
+const sqliteDialect = new SQLiteDialect();
 function compileSqlite(query) {
 	const compiled = sqliteDialect.sqlToQuery(query);
 	return {
@@ -22,7 +23,7 @@ function createSqliteInsightRunner(opts) {
 		}) };
 	};
 	return { db: drizzle(callback, {
-		schema: schemaOverride ?? schema,
+		relations: buildRelations(schemaOverride ?? schema, {}),
 		logger
 	}) };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-sqlite",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "SQLite / D1 engine adapter for @gscdump/analysis — typed analytics over sqlite-proxy executors (Cloudflare D1, libsql).",
   "author": {
     "name": "Harlan Wilton",
@@ -41,13 +41,13 @@
     "node": ">=22"
   },
   "peerDependencies": {
-    "drizzle-orm": "1.0.0-rc.3"
+    "drizzle-orm": "1.0.0-rc.4"
   },
   "dependencies": {
-    "@gscdump/engine": "^2.0.1"
+    "@gscdump/engine": "^2.0.3"
   },
   "devDependencies": {
-    "drizzle-orm": "1.0.0-rc.3",
+    "drizzle-orm": "1.0.0-rc.4",
     "vitest": "^4.1.10"
   },
   "scripts": {