@gscdump/engine-sqlite 0.9.2 → 0.11.0

package/dist/index.d.mts

@@ -1,10 +1,11 @@
-import { ResolverAdapter, SqlQuerySource, compileSqlite } from "@gscdump/engine/resolver";
+import { AnalysisQuerySource } from "@gscdump/engine/source";
+import { ResolverAdapter } from "@gscdump/engine/resolver";
 import { SQL, SQL as SQL$1, and, eq, gte, lte, sql } from "drizzle-orm";
-import * as _$drizzle_orm_sqlite_core0 from "drizzle-orm/sqlite-core";
-import { ManifestStore } from "@gscdump/engine";
 import * as _$_gscdump_engine_scope0 from "@gscdump/engine/scope";
 import { ScopedRunnerOptions, TableScope } from "@gscdump/engine/scope";
+import * as _$drizzle_orm_sqlite_core0 from "drizzle-orm/sqlite-core";
 import { SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy";
+import { ManifestStore } from "@gscdump/engine";
 import { ComparisonMode, ResolveWindowOptions, ResolvedWindow, WindowPreset, resolveWindow } from "@gscdump/engine/period";
 import { DrizzleD1Database } from "drizzle-orm/d1";
 /**
@@ -2233,6 +2234,10 @@ declare const schema: {
   }>;
 };
 type Schema = typeof schema;
+declare function compileSqlite(query: SQL$1): {
+  sql: string;
+  params: unknown[];
+};
 type SqliteRowExecutor = (sql: string, params: unknown[], method: 'run' | 'all' | 'values' | 'get') => Promise<{
   rows: unknown[];
 }>;
@@ -2273,7 +2278,7 @@ interface EngineConfig {
   /** Override for hosts that expose REGEXP (D1, libsql, sqlite3+regexp). */
   regex?: boolean;
 }
-declare function createEngine(config: EngineConfig): SqlQuerySource;
+declare function createEngine(config: EngineConfig): AnalysisQuerySource;
 type MetricTable = typeof gsc_pages | typeof gsc_keywords | typeof gsc_countries | typeof gsc_devices | typeof gsc_page_keywords;
 declare function aggClicks(t: MetricTable): SQL$1;
 declare function aggImpressions(t: MetricTable): SQL$1;

package/dist/index.mjs

@@ -1,9 +1,10 @@
-import { assertSchemaInSync, compileSqlite, compileSqlite as compileSqlite$1, createResolverAdapter, createSqlQuerySource } from "@gscdump/engine/resolver";
+import { createSqlQuerySource } from "@gscdump/engine/source";
+import { assertSchemaInSync, createResolverAdapter } from "@gscdump/engine/resolver";
 import { and, and as and$1, eq, eq as eq$1, gte, inArray, isNotNull, isNull, lt, lte, lte as lte$1, or, sql, sql as sql$1 } from "drizzle-orm";
-import { index, integer, primaryKey, real, sqliteTable, text, unique } from "drizzle-orm/sqlite-core";
-import { inferSearchType } from "@gscdump/engine";
 import { createScopedHelpers } from "@gscdump/engine/scope";
+import { SQLiteAsyncDialect, index, integer, primaryKey, real, sqliteTable, text, unique } from "drizzle-orm/sqlite-core";
 import { drizzle } from "drizzle-orm/sqlite-proxy";
+import { inferSearchType } from "@gscdump/engine";
 import { resolveWindow } from "@gscdump/engine/period";
 function metricCols() {
 	return {
@@ -69,6 +70,31 @@ assertSchemaInSync({
 	tableKeyToName: (key) => key.replace(GSC_PREFIX_RE, ""),
 	mode: "superset"
 });
+const sqliteDialect = new SQLiteAsyncDialect();
+function compileSqlite(query) {
+	const compiled = sqliteDialect.sqlToQuery(query);
+	return {
+		sql: compiled.sql,
+		params: compiled.params
+	};
+}
+function createSqliteInsightRunner(opts) {
+	const { executor, logger, rowsAsArrays, schema: schemaOverride } = opts;
+	const callback = async (sql, params, method) => {
+		const result = await executor(sql, params, method);
+		if (!rowsAsArrays) return { rows: result.rows };
+		return { rows: result.rows.map((r) => {
+			if (Array.isArray(r)) return r;
+			if (r && typeof r === "object") return Object.values(r);
+			return r;
+		}) };
+	};
+	return { db: drizzle(callback, {
+		schema: schemaOverride ?? schema,
+		logger
+	}) };
+}
+const { scopeFor, mergeScope } = createScopedHelpers(schema);
 function createSqliteResolverAdapter(options = {}) {
 	return createResolverAdapter({
 		schema,
@@ -84,7 +110,7 @@ function createSqliteResolverAdapter(options = {}) {
 		regexPredicate: (expr, pattern, negate) => negate ? sql$1`NOT (${expr} REGEXP ${pattern})` : sql$1`${expr} REGEXP ${pattern}`,
 		tableLabel: "sqlite/resolver-adapter",
 		includeSiteId: true,
-		compile: compileSqlite$1,
+		compile: compileSqlite,
 		capabilities: {
 			regex: options.regex ?? false,
 			comparisonJoin: true,
@@ -103,6 +129,7 @@ function createEngine(config) {
 	const { executor, siteId, regex } = config;
 	return createSqlQuerySource({
 		name: "sqlite",
+		kind: "local",
 		adapter: regex === void 0 ? sqliteResolverAdapter : createSqliteResolverAdapter({ regex }),
 		execute: async (sql, params) => {
 			return (await executor(sql, params, "all")).rows;
@@ -472,21 +499,4 @@ function createD1ManifestStore(db) {
 		purgeTenant
 	};
 }
-function createSqliteInsightRunner(opts) {
-	const { executor, logger, rowsAsArrays, schema: schemaOverride } = opts;
-	const callback = async (sql, params, method) => {
-		const result = await executor(sql, params, method);
-		if (!rowsAsArrays) return { rows: result.rows };
-		return { rows: result.rows.map((r) => {
-			if (Array.isArray(r)) return r;
-			if (r && typeof r === "object") return Object.values(r);
-			return r;
-		}) };
-	};
-	return { db: drizzle(callback, {
-		schema: schemaOverride ?? schema,
-		logger
-	}) };
-}
-const { scopeFor, mergeScope } = createScopedHelpers(schema);
 export { aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-sqlite",
   "type": "module",
-  "version": "0.9.2",
+  "version": "0.11.0",
   "description": "SQLite / D1 engine adapter for @gscdump/analysis — typed analytics over sqlite-proxy executors (Cloudflare D1, libsql).",
   "author": {
     "name": "Harlan Wilton",
@@ -44,8 +44,8 @@
     "drizzle-orm": "^0.45.2"
   },
   "dependencies": {
-    "@gscdump/engine": "0.9.2",
-    "gscdump": "0.9.2"
+    "@gscdump/engine": "0.11.0",
+    "gscdump": "0.11.0"
   },
   "devDependencies": {
     "drizzle-orm": "^0.45.2",