@gscdump/engine-sqlite 0.32.12 → 0.33.3

package/README.md

@@ -68,6 +68,16 @@ Always import `sql` from `@gscdump/engine-sqlite` — not `drizzle-orm` directly
 - `sqliteResolverAdapter` / `createSqliteResolverAdapter` / `probeSqliteRegex` — dialect adapter for the resolver kit.
 - `resolveWindow` (re-exported from `@gscdump/engine/period`).
 
+## D1 Analytics Table Status
+
+The `gsc_*` analytics tables remain a supported compatibility surface. The
+2026-06-29 Iceberg migration audit found active package exports, resolver tests,
+and docs for `gsc_pages`, `gsc_keywords`, `gsc_page_keywords`, `gsc_countries`,
+and `gsc_devices`. Do not remove these tables as part of the Iceberg/canonical
+migration. A future retirement should be staged behind a consumer usage audit,
+dual-read/shadow-read checks, and a release note that names the replacement
+Iceberg/R2 SQL path.
+
 ## Related
 
 - [`@gscdump/engine`](../engine) — Storage contracts + dialect-neutral resolver.

package/dist/index.d.mts

@@ -342,22 +342,6 @@ declare const gsc_keywords: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
       identity: undefined;
       generated: undefined;
     }, {}>;
-    query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-      name: string;
-      tableName: "gsc_keywords";
-      dataType: "string";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}>;
     id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
       name: string;
       tableName: "gsc_keywords";
@@ -1010,22 +994,6 @@ declare const gsc_page_keywords: import("drizzle-orm/sqlite-core").SQLiteTableWi
       identity: undefined;
       generated: undefined;
     }, {}>;
-    query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-      name: string;
-      tableName: "gsc_page_keywords";
-      dataType: "string";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}>;
     id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
       name: string;
       tableName: "gsc_page_keywords";
@@ -1138,6 +1106,125 @@ declare const gsc_page_keywords: import("drizzle-orm/sqlite-core").SQLiteTableWi
   };
   dialect: "sqlite";
 }>;
+declare const gsc_query_dim: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
+  name: "gsc_query_dim";
+  schema: undefined;
+  columns: {
+    site_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "string";
+      data: string;
+      driverParam: string;
+      notNull: true;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+    query: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "string";
+      data: string;
+      driverParam: string;
+      notNull: true;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+    query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "string";
+      data: string;
+      driverParam: string;
+      notNull: true;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+    normalizer_version: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "number int53";
+      data: number;
+      driverParam: number;
+      notNull: true;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: undefined;
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+    intent_code: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "number int53";
+      data: number;
+      driverParam: number;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: undefined;
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+    intent_version: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "number int53";
+      data: number;
+      driverParam: number;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: undefined;
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+    built_at: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "gsc_query_dim";
+      dataType: "number int53";
+      data: number;
+      driverParam: number;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: undefined;
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
+  };
+  dialect: "sqlite";
+}>;
 declare const schema: {
   gsc_pages: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
     name: "gsc_pages";
@@ -1451,22 +1538,6 @@ declare const schema: {
         identity: undefined;
         generated: undefined;
       }, {}>;
-      query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-        name: string;
-        tableName: "gsc_keywords";
-        dataType: "string";
-        data: string;
-        driverParam: string;
-        notNull: false;
-        hasDefault: false;
-        isPrimaryKey: false;
-        isAutoincrement: false;
-        hasRuntimeDefault: false;
-        enumValues: [string, ...string[]];
-        baseColumn: never;
-        identity: undefined;
-        generated: undefined;
-      }, {}>;
       id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
         name: string;
         tableName: "gsc_keywords";
@@ -2119,22 +2190,6 @@ declare const schema: {
         identity: undefined;
         generated: undefined;
       }, {}>;
-      query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-        name: string;
-        tableName: "gsc_page_keywords";
-        dataType: "string";
-        data: string;
-        driverParam: string;
-        notNull: false;
-        hasDefault: false;
-        isPrimaryKey: false;
-        isAutoincrement: false;
-        hasRuntimeDefault: false;
-        enumValues: [string, ...string[]];
-        baseColumn: never;
-        identity: undefined;
-        generated: undefined;
-      }, {}>;
       id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
         name: string;
         tableName: "gsc_page_keywords";
@@ -2803,22 +2858,6 @@ declare const schema: {
         identity: undefined;
         generated: undefined;
       }, {}>;
-      query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-        name: string;
-        tableName: "gsc_search_appearance_queries";
-        dataType: "string";
-        data: string;
-        driverParam: string;
-        notNull: false;
-        hasDefault: false;
-        isPrimaryKey: false;
-        isAutoincrement: false;
-        hasRuntimeDefault: false;
-        enumValues: [string, ...string[]];
-        baseColumn: never;
-        identity: undefined;
-        generated: undefined;
-      }, {}>;
       id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
         name: string;
         tableName: "gsc_search_appearance_queries";
@@ -3063,22 +3102,6 @@ declare const schema: {
         identity: undefined;
         generated: undefined;
       }, {}>;
-      query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-        name: string;
-        tableName: "gsc_search_appearance_page_queries";
-        dataType: "string";
-        data: string;
-        driverParam: string;
-        notNull: false;
-        hasDefault: false;
-        isPrimaryKey: false;
-        isAutoincrement: false;
-        hasRuntimeDefault: false;
-        enumValues: [string, ...string[]];
-        baseColumn: never;
-        identity: undefined;
-        generated: undefined;
-      }, {}>;
       id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
         name: string;
         tableName: "gsc_search_appearance_page_queries";
@@ -3419,6 +3442,125 @@ declare const schema: {
     };
     dialect: "sqlite";
   }>;
+  gsc_query_dim: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
+    name: "gsc_query_dim";
+    schema: undefined;
+    columns: {
+      site_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "string";
+        data: string;
+        driverParam: string;
+        notNull: true;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: [string, ...string[]];
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+      query: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "string";
+        data: string;
+        driverParam: string;
+        notNull: true;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: [string, ...string[]];
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+      query_canonical: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "string";
+        data: string;
+        driverParam: string;
+        notNull: true;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: [string, ...string[]];
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+      normalizer_version: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: true;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+      intent_code: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+      intent_version: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+      built_at: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "gsc_query_dim";
+        dataType: "number int53";
+        data: number;
+        driverParam: number;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
+    };
+    dialect: "sqlite";
+  }>;
 };
 type Schema = typeof schema;
 declare function compileSqlite(query: SQL$1): {
@@ -3457,7 +3599,7 @@ declare function createSqliteInsightRunner<TSchema extends Record<string, unknow
  * (one or both). This lets callers pass unbounded query-string params
  * through without first normalizing them.
  */
-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", opts: ScopedRunnerOptions) => TableScope, mergeScope: typeof import("@gscdump/engine/scope").mergeScope;
+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_query_dim" | "gsc_hourly_pages", opts: ScopedRunnerOptions) => TableScope, mergeScope: typeof import("@gscdump/engine/scope").mergeScope;
 type SqliteQueryExecutor = SqliteRowExecutor;
 interface EngineConfig {
   executor: SqliteQueryExecutor;
@@ -4257,7 +4399,7 @@ interface CreateSqliteResolverAdapterOptions {
   regex?: boolean;
 }
 declare function createSqliteResolverAdapter(options?: CreateSqliteResolverAdapterOptions): ResolverAdapter<TableKey>;
-declare const sqliteResolverAdapter: ResolverAdapter<"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">;
+declare const sqliteResolverAdapter: ResolverAdapter<"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_query_dim" | "gsc_hourly_pages">;
 /**
  * One-shot probe that detects whether the host SQLite has a working REGEXP
  * function. SQLite ships REGEXP as a no-op stub by default; D1, libsql, and
@@ -4275,4 +4417,4 @@ interface CreateSqliteResolverAdapterFromExecutorOptions {
  * an executor handy.
  */
 declare function createSqliteResolverAdapterFromExecutor(options: CreateSqliteResolverAdapterFromExecutorOptions): Promise<ResolverAdapter<TableKey>>;
-export { type AnalyticsManifestDb, type CachedManifestStore, type CachedManifestStoreOptions, type ComparisonMode, type EngineConfig, type R2LockInsert, type R2LockSelect, type R2ManifestInsert, type R2ManifestSelect, type R2ShadowDiffInsert, type R2ShadowDiffSelect, type R2SyncStateInsert, type R2SyncStateSelect, type R2WatermarkInsert, type R2WatermarkSelect, type R2WriteErrorInsert, type R2WriteErrorSelect, type ResolveWindowOptions, type ResolvedWindow, type SQL, type Schema, type ScopedRunnerOptions, type SqliteInsightRunner, type SqliteInsightRunnerOptions, type SqliteQueryExecutor, type SqliteRowExecutor, type TableKey, type TableScope, type WindowPreset, aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createCachedManifestStore, 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 };
+export { type AnalyticsManifestDb, type CachedManifestStore, type CachedManifestStoreOptions, type ComparisonMode, type EngineConfig, type R2LockInsert, type R2LockSelect, type R2ManifestInsert, type R2ManifestSelect, type R2ShadowDiffInsert, type R2ShadowDiffSelect, type R2SyncStateInsert, type R2SyncStateSelect, type R2WatermarkInsert, type R2WatermarkSelect, type R2WriteErrorInsert, type R2WriteErrorSelect, type ResolveWindowOptions, type ResolvedWindow, type SQL, type Schema, type ScopedRunnerOptions, type SqliteInsightRunner, type SqliteInsightRunnerOptions, type SqliteQueryExecutor, type SqliteRowExecutor, type TableKey, type TableScope, type WindowPreset, aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createCachedManifestStore, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gsc_query_dim, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };

package/dist/index.mjs

@@ -20,6 +20,7 @@ function createCachedManifestStore(inner, options = {}) {
 		const userId = String(scope.userId);
 		if (scope.siteId && scope.table && scope.searchType !== void 0) {
 			cache.delete(`${userId}\0${scope.siteId}\0${scope.table}\0${scope.searchType}`);
+			cache.delete(`${userId}\0${scope.siteId}\0${scope.table}\0`);
 			return;
 		}
 		const prefix = scope.siteId && scope.table ? `${userId}\0${scope.siteId}\0${scope.table}\0` : scope.siteId ? `${userId}\0${scope.siteId}\0` : `${userId}\0`;
@@ -48,6 +49,12 @@ function createCachedManifestStore(inner, options = {}) {
 				table: entry.table,
 				searchType: entry.searchType
 			});
+			for (const e of superseding ?? []) bust({
+				userId: e.userId,
+				siteId: e.siteId ?? "",
+				table: e.table,
+				searchType: e.searchType
+			});
 		},
 		registerVersions: async (entries, superseding) => {
 			await inner.registerVersions(entries, superseding);
@@ -57,15 +64,36 @@ function createCachedManifestStore(inner, options = {}) {
 				table: e.table,
 				searchType: e.searchType
 			});
+			for (const e of superseding ?? []) bust({
+				userId: e.userId,
+				siteId: e.siteId ?? "",
+				table: e.table,
+				searchType: e.searchType
+			});
 		},
 		listRetired: inner.listRetired.bind(inner),
-		delete: inner.delete.bind(inner),
+		delete: async (entries) => {
+			await inner.delete(entries);
+			for (const e of entries) bust({
+				userId: e.userId,
+				siteId: e.siteId ?? "",
+				table: e.table,
+				searchType: e.searchType
+			});
+		},
 		getWatermarks: inner.getWatermarks.bind(inner),
 		bumpWatermark: inner.bumpWatermark.bind(inner),
 		getSyncStates: inner.getSyncStates.bind(inner),
 		setSyncState: inner.setSyncState.bind(inner),
 		withLock: inner.withLock.bind(inner),
-		purgeTenant: inner.purgeTenant.bind(inner),
+		purgeTenant: async (filter) => {
+			const result = await inner.purgeTenant(filter);
+			bust({
+				userId: filter.userId,
+				siteId: filter.siteId
+			});
+			return result;
+		},
 		bust,
 		clear: () => cache.clear(),
 		stats: () => ({ size: cache.size })
@@ -92,68 +120,78 @@ const gsc_pages = sqliteTable("gsc_pages", {
 	...baseCols(),
 	url: text("url").notNull(),
 	...metricCols()
-});
+}, (t) => [index("idx_gsc_pages_site_date").on(t.site_id, t.date)]);
 const gsc_keywords = sqliteTable("gsc_keywords", {
 	...baseCols(),
 	query: text("query").notNull(),
-	query_canonical: text("query_canonical"),
 	...metricCols()
-});
+}, (t) => [index("idx_gsc_keywords_site_date").on(t.site_id, t.date)]);
 const gsc_countries = sqliteTable("gsc_countries", {
 	...baseCols(),
 	country: text("country").notNull(),
 	...metricCols()
-});
+}, (t) => [index("idx_gsc_countries_site_date").on(t.site_id, t.date)]);
 const gsc_devices = sqliteTable("gsc_devices", {
 	...baseCols(),
 	device: text("device").notNull(),
 	...metricCols()
-});
+}, (t) => [index("idx_gsc_devices_site_date").on(t.site_id, t.date)]);
 const gsc_page_keywords = sqliteTable("gsc_page_keywords", {
 	...baseCols(),
 	url: text("url").notNull(),
 	query: text("query").notNull(),
-	query_canonical: text("query_canonical"),
 	...metricCols()
-});
+}, (t) => [index("idx_gsc_page_keywords_site_date").on(t.site_id, t.date)]);
+const gsc_search_appearance = sqliteTable("gsc_search_appearance", {
+	...baseCols(),
+	searchAppearance: text("searchAppearance").notNull(),
+	...metricCols()
+}, (t) => [index("idx_gsc_search_appearance_site_date").on(t.site_id, t.date)]);
+const gsc_search_appearance_pages = sqliteTable("gsc_search_appearance_pages", {
+	...baseCols(),
+	searchAppearance: text("searchAppearance").notNull(),
+	url: text("url").notNull(),
+	...metricCols()
+}, (t) => [index("idx_gsc_search_appearance_pages_site_date").on(t.site_id, t.date)]);
+const gsc_search_appearance_queries = sqliteTable("gsc_search_appearance_queries", {
+	...baseCols(),
+	searchAppearance: text("searchAppearance").notNull(),
+	query: text("query").notNull(),
+	...metricCols()
+}, (t) => [index("idx_gsc_search_appearance_queries_site_date").on(t.site_id, t.date)]);
+const gsc_search_appearance_page_queries = sqliteTable("gsc_search_appearance_page_queries", {
+	...baseCols(),
+	searchAppearance: text("searchAppearance").notNull(),
+	url: text("url").notNull(),
+	query: text("query").notNull(),
+	...metricCols()
+}, (t) => [index("idx_gsc_search_appearance_page_queries_site_date").on(t.site_id, t.date)]);
+const gsc_query_dim = sqliteTable("gsc_query_dim", {
+	site_id: text("site_id").notNull(),
+	query: text("query").notNull(),
+	query_canonical: text("query_canonical").notNull(),
+	normalizer_version: integer("normalizer_version").notNull(),
+	intent_code: integer("intent_code"),
+	intent_version: integer("intent_version"),
+	built_at: integer("built_at")
+}, (t) => [index("idx_gsc_query_dim_site_query").on(t.site_id, t.query)]);
 const schema = {
 	gsc_pages,
 	gsc_keywords,
 	gsc_countries,
 	gsc_devices,
 	gsc_page_keywords,
-	gsc_search_appearance: sqliteTable("gsc_search_appearance", {
-		...baseCols(),
-		searchAppearance: text("searchAppearance").notNull(),
-		...metricCols()
-	}),
-	gsc_search_appearance_pages: sqliteTable("gsc_search_appearance_pages", {
-		...baseCols(),
-		searchAppearance: text("searchAppearance").notNull(),
-		url: text("url").notNull(),
-		...metricCols()
-	}),
-	gsc_search_appearance_queries: sqliteTable("gsc_search_appearance_queries", {
-		...baseCols(),
-		searchAppearance: text("searchAppearance").notNull(),
-		query: text("query").notNull(),
-		query_canonical: text("query_canonical"),
-		...metricCols()
-	}),
-	gsc_search_appearance_page_queries: sqliteTable("gsc_search_appearance_page_queries", {
-		...baseCols(),
-		searchAppearance: text("searchAppearance").notNull(),
-		url: text("url").notNull(),
-		query: text("query").notNull(),
-		query_canonical: text("query_canonical"),
-		...metricCols()
-	}),
+	gsc_search_appearance,
+	gsc_search_appearance_pages,
+	gsc_search_appearance_queries,
+	gsc_search_appearance_page_queries,
 	gsc_hourly_pages: sqliteTable("gsc_hourly_pages", {
 		...baseCols(),
 		url: text("url").notNull(),
 		hour: integer("hour").notNull(),
 		...metricCols()
-	})
+	}, (t) => [index("idx_gsc_hourly_pages_site_date").on(t.site_id, t.date)]),
+	gsc_query_dim
 };
 const GSC_TABLE_TO_LOGICAL = {
 	gsc_pages: "pages",
@@ -165,7 +203,8 @@ const GSC_TABLE_TO_LOGICAL = {
 	gsc_search_appearance_pages: "search_appearance_pages",
 	gsc_search_appearance_queries: "search_appearance_queries",
 	gsc_search_appearance_page_queries: "search_appearance_page_queries",
-	gsc_hourly_pages: "hourly_pages"
+	gsc_hourly_pages: "hourly_pages",
+	gsc_query_dim: null
 };
 assertSchemaInSync({
 	label: "sqlite",
@@ -217,6 +256,8 @@ 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,
+		queryDimTableRef: () => sql$1.raw("\"gsc_query_dim\" AS \"query_dim\""),
+		queryDimSiteScoped: true,
 		compile: compileSqlite,
 		capabilities: {
 			regex: options.regex ?? false,
@@ -272,6 +313,7 @@ const r2Manifest = sqliteTable("r2_manifest", {
 	schemaVersion: integer("schema_version")
 }, (t) => [
 	index("idx_r2_manifest_live").on(t.userId, t.siteId, t.table, t.partition, t.retiredAt),
+	index("idx_r2_manifest_lookup").on(t.userId, t.siteId, t.table, t.searchType, t.tier, t.partition, t.retiredAt),
 	index("idx_r2_manifest_retired").on(t.retiredAt),
 	index("idx_r2_manifest_tier").on(t.userId, t.siteId, t.table, t.tier, t.retiredAt),
 	unique("r2_manifest_object_key_unique").on(t.objectKey)
@@ -372,6 +414,8 @@ const LOCK_TTL_MS = 3e4;
 const LOCK_ACQUIRE_TIMEOUT_MS = 5e3;
 const LOCK_RETRY_MIN_MS = 25;
 const LOCK_RETRY_MAX_MS = 150;
+const D1_BATCH_LIMIT = 95;
+const D1_IN_CLAUSE_CHUNK = 90;
 function lockScopeKey(scope) {
 	return `${scope.userId}|${siteIdOf(scope.siteId)}|${scope.table}|${scope.partition}`;
 }
@@ -396,15 +440,15 @@ function createD1ManifestStore(db) {
 		}
 		if (filter.searchType !== void 0) baseConds.push(filter.searchType === "web" ? or(eq$1(r2Manifest.searchType, "web"), isNull(r2Manifest.searchType)) : eq$1(r2Manifest.searchType, filter.searchType));
 		const PARTITION_CHUNK = 80;
-		if (filter.partitions && filter.partitions.length > 0) {
-			const out = [];
+		if (filter.partitions) {
+			if (filter.partitions.length === 0) return [];
+			const statements = [];
 			for (let i = 0; i < filter.partitions.length; i += PARTITION_CHUNK) {
 				const slice = filter.partitions.slice(i, i + PARTITION_CHUNK);
 				const conds = [...baseConds, inArray(r2Manifest.partition, slice)];
-				const rows = await db.select().from(r2Manifest).where(and$1(...conds));
-				for (const r of rows) out.push(fromRow(r));
+				statements.push(db.select().from(r2Manifest).where(and$1(...conds)));
 			}
-			return out;
+			return (await db.batch(statements)).flat().map((r) => fromRow(r));
 		}
 		return (await db.select().from(r2Manifest).where(and$1(...baseConds))).map(fromRow);
 	}
@@ -415,9 +459,8 @@ function createD1ManifestStore(db) {
 		const statements = [];
 		if (superseding && superseding.length > 0) {
 			const keys = superseding.map((s) => s.objectKey);
-			const CHUNK = 90;
-			for (let i = 0; i < keys.length; i += CHUNK) {
-				const slice = keys.slice(i, i + CHUNK);
+			for (let i = 0; i < keys.length; i += D1_IN_CLAUSE_CHUNK) {
+				const slice = keys.slice(i, i + D1_IN_CLAUSE_CHUNK);
 				statements.push(db.update(r2Manifest).set({ retiredAt: supersededAt }).where(and$1(inArray(r2Manifest.objectKey, slice), isNull(r2Manifest.retiredAt))));
 			}
 		}
@@ -438,9 +481,8 @@ function createD1ManifestStore(db) {
 			}
 		}));
 		if (statements.length === 0) return;
-		const BATCH_LIMIT = 95;
-		for (let i = 0; i < statements.length; i += BATCH_LIMIT) {
-			const chunk = statements.slice(i, i + BATCH_LIMIT);
+		for (let i = 0; i < statements.length; i += D1_BATCH_LIMIT) {
+			const chunk = statements.slice(i, i + D1_BATCH_LIMIT);
 			await db.batch(chunk);
 		}
 	}
@@ -450,8 +492,9 @@ function createD1ManifestStore(db) {
 	async function deleteEntries(entries) {
 		if (entries.length === 0) return;
 		const keys = entries.map((e) => e.objectKey);
-		const CHUNK = 90;
-		for (let i = 0; i < keys.length; i += CHUNK) await db.delete(r2Manifest).where(inArray(r2Manifest.objectKey, keys.slice(i, i + CHUNK)));
+		const statements = [];
+		for (let i = 0; i < keys.length; i += D1_IN_CLAUSE_CHUNK) statements.push(db.delete(r2Manifest).where(inArray(r2Manifest.objectKey, keys.slice(i, i + D1_IN_CLAUSE_CHUNK))));
+		for (let i = 0; i < statements.length; i += D1_BATCH_LIMIT) await db.batch(statements.slice(i, i + D1_BATCH_LIMIT));
 	}
 	async function getWatermarks(filter) {
 		const conds = [eq$1(r2Watermarks.userId, Number(filter.userId))];
@@ -484,7 +527,7 @@ function createD1ManifestStore(db) {
 			set: {
 				newestDateSynced: sql$1`CASE WHEN excluded.newest_date_synced > newest_date_synced THEN excluded.newest_date_synced ELSE newest_date_synced END`,
 				oldestDateSynced: sql$1`CASE WHEN excluded.oldest_date_synced < oldest_date_synced THEN excluded.oldest_date_synced ELSE oldest_date_synced END`,
-				lastSyncAt: sql$1`excluded.last_sync_at`
+				lastSyncAt: sql$1`CASE WHEN excluded.last_sync_at > last_sync_at THEN excluded.last_sync_at ELSE last_sync_at END`
 			}
 		}).run();
 	}
@@ -607,4 +650,4 @@ function createD1ManifestStore(db) {
 		purgeTenant
 	};
 }
-export { aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createCachedManifestStore, 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 };
+export { aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createCachedManifestStore, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gsc_query_dim, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };

package/dist/r2-manifest-schema.mjs

@@ -16,6 +16,7 @@ const r2Manifest = sqliteTable("r2_manifest", {
 	schemaVersion: integer("schema_version")
 }, (t) => [
 	index("idx_r2_manifest_live").on(t.userId, t.siteId, t.table, t.partition, t.retiredAt),
+	index("idx_r2_manifest_lookup").on(t.userId, t.siteId, t.table, t.searchType, t.tier, t.partition, t.retiredAt),
 	index("idx_r2_manifest_retired").on(t.retiredAt),
 	index("idx_r2_manifest_tier").on(t.userId, t.siteId, t.table, t.tier, t.retiredAt),
 	unique("r2_manifest_object_key_unique").on(t.objectKey)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-sqlite",
   "type": "module",
-  "version": "0.32.12",
+  "version": "0.33.3",
   "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": "1.0.0-rc.3"
   },
   "dependencies": {
-    "@gscdump/engine": "0.32.12",
-    "gscdump": "0.32.12"
+    "@gscdump/engine": "0.33.3",
+    "gscdump": "0.33.3"
   },
   "devDependencies": {
     "drizzle-orm": "1.0.0-rc.3",