kitcn 0.15.13 → 0.15.15

package/dist/auth/client/index.d.ts

@@ -5,11 +5,12 @@ import { ReactNode } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
 import { AuthConfig } from "convex/server";
 import * as better_auth0 from "better-auth";
-import { BetterAuthClientPlugin, Session, User } from "better-auth";
+import { Session, User } from "better-auth";
 import * as better_auth_api0 from "better-auth/api";
 import * as better_auth_plugins_oidc_provider0 from "better-auth/plugins/oidc-provider";
 import * as jose from "jose";
 import { BetterAuthOptions } from "better-auth/minimal";
+import { BetterAuthClientPlugin } from "better-auth/client";
 import { createAuthClient } from "better-auth/react";
 
 //#region src/auth/internal/convex-plugin.d.ts
@@ -294,8 +295,11 @@ declare const convexClient: () => {
 };
 //#endregion
 //#region src/auth-client/types.d.ts
+type OpaqueClientPlugin = Omit<BetterAuthClientPlugin, '$InferServerPlugin'> & {
+  $InferServerPlugin?: never;
+};
 type ConvexClient = ReturnType<typeof convexClient>;
-type CrossDomainClient = BetterAuthClientPlugin & {
+type CrossDomainClient = OpaqueClientPlugin & {
   id: 'cross-domain';
   getActions: (...args: never[]) => {
     crossDomain: {
@@ -307,8 +311,8 @@ type CrossDomainClient = BetterAuthClientPlugin & {
     notifySessionSignal: () => void;
   };
 };
-type PluginsWithCrossDomain = (CrossDomainClient | ConvexClient | BetterAuthClientPlugin)[];
-type PluginsWithoutCrossDomain = (ConvexClient | BetterAuthClientPlugin)[];
+type PluginsWithCrossDomain = (CrossDomainClient | ConvexClient | OpaqueClientPlugin)[];
+type PluginsWithoutCrossDomain = (ConvexClient | OpaqueClientPlugin)[];
 type AuthSessionState = {
   data: unknown;
   error?: unknown;
@@ -346,7 +350,7 @@ type ConvexAuthProviderClient = {
   updateSession?: (...args: never[]) => unknown;
   useSession: () => AuthSessionState;
 } & Record<string, unknown>;
-type AuthClientWithPlugins<Plugins extends PluginsWithCrossDomain | PluginsWithoutCrossDomain> = ReturnType<typeof createAuthClient<{
+type AuthClientWithPlugins<Plugins extends BetterAuthClientPlugin[]> = ReturnType<typeof createAuthClient<{
   plugins: Plugins;
 }>>;
 type AuthClient = AuthClientWithPlugins<PluginsWithCrossDomain> | AuthClientWithPlugins<PluginsWithoutCrossDomain>;

package/dist/auth/index.d.ts

@@ -63,7 +63,7 @@ declare const adapterConfig: {
     data: any;
     fieldAttributes: better_auth0.DBFieldAttribute;
     field: string;
-    action: "create" | "update" | "findOne" | "findMany" | "updateMany" | "delete" | "deleteMany" | "consumeOne" | "count";
+    action: "create" | "update" | "findOne" | "findMany" | "updateMany" | "delete" | "deleteMany" | "consumeOne" | "incrementOne" | "count";
     model: string;
     schema: BetterAuthDBSchema;
     options: BetterAuthOptions;

package/dist/{backend-core-D5P0hNYD.mjs → backend-core-qvNnNFFS.mjs}

@@ -6234,8 +6234,9 @@ const EXACT_VERSION_RE = /^(\d+)\.(\d+)\.\d+$/;
 const VERSION_IN_SPEC_RE = /(\d+)\.(\d+)(?:\.\d+)?/;
 const PLAIN_VERSION_SPEC_RE = /^[\^~]?v?\d+\.\d+(?:\.\d+)?$/;
 const UPPER_BOUND_RE = /(?:^|\s)<={0,1}\s*v?(\d+)\.(\d+)(?:\.\d+)?/g;
+const SUPPORTED_CONCAVE_CLI_VERSION = "0.0.1-alpha.14";
 const SUPPORTED_CONVEX_VERSION = "1.38.0";
-const SUPPORTED_BETTER_AUTH_VERSION = "1.6.15";
+const SUPPORTED_BETTER_AUTH_VERSION = "1.6.18";
 const SUPPORTED_BETTER_AUTH_MIN_VERSION = "1.6.11";
 const SUPPORTED_HONO_VERSION = "4.12.9";
 const SUPPORTED_OPENTELEMETRY_API_VERSION = "1.9.0";
@@ -6312,6 +6313,7 @@ const SUPPORTED_DEPENDENCY_VERSIONS = {
 		exact: SUPPORTED_BETTER_AUTH_VERSION,
 		peer: getMinorVersionPeerRange(SUPPORTED_BETTER_AUTH_MIN_VERSION, SUPPORTED_BETTER_AUTH_VERSION)
 	},
+	concaveCli: { exact: SUPPORTED_CONCAVE_CLI_VERSION },
 	hono: { exact: SUPPORTED_HONO_VERSION },
 	opentelemetryApi: { exact: SUPPORTED_OPENTELEMETRY_API_VERSION },
 	tanstackReactQuery: { exact: SUPPORTED_TANSTACK_REACT_QUERY_VERSION },
@@ -10243,7 +10245,7 @@ const AUTH_ENV_FIELDS = [
 		schema: "z.string().optional()"
 	}
 ];
-const BETTER_AUTH_EXPO_INSTALL_SPEC = "@better-auth/expo@1.6.15";
+const BETTER_AUTH_EXPO_INSTALL_SPEC = "@better-auth/expo@1.6.18";
 const EXPO_SECURE_STORE_INSTALL_SPEC = "expo-secure-store@~55.0.8";
 const EXPO_NETWORK_INSTALL_SPEC = "expo-network@~55.0.8";
 const AUTH_FILES = [
@@ -12710,7 +12712,7 @@ const INIT_EXPO_PACKAGE_JSON_DEPENDENCIES = {
 const INIT_EXPO_PACKAGE_JSON_DEV_DEPENDENCIES = { "@types/bun": "latest" };
 const getInitExpoPackageJsonDevDependencies = (options) => ({
 	...INIT_EXPO_PACKAGE_JSON_DEV_DEPENDENCIES,
-	...options.backend === "concave" ? { "@concavejs/cli": "latest" } : {}
+	...options.backend === "concave" ? { "@concavejs/cli": SUPPORTED_DEPENDENCY_VERSIONS.concaveCli.exact } : {}
 });
 function renderInitExpoPackageJsonTemplate(source, options = {}) {
 	const existing = source ? JSON.parse(source) : {};
@@ -12989,7 +12991,7 @@ const INIT_NEXT_PACKAGE_JSON_DEPENDENCIES = {
 const INIT_NEXT_PACKAGE_JSON_DEV_DEPENDENCIES = { "@types/bun": "latest" };
 const getInitNextPackageJsonDevDependencies = (options) => ({
 	...INIT_NEXT_PACKAGE_JSON_DEV_DEPENDENCIES,
-	...options.backend === "concave" ? { "@concavejs/cli": "latest" } : {}
+	...options.backend === "concave" ? { "@concavejs/cli": SUPPORTED_DEPENDENCY_VERSIONS.concaveCli.exact } : {}
 });
 function renderInitNextPackageJsonTemplate(source, options = {}) {
 	const existing = source ? JSON.parse(source) : {};
@@ -13201,7 +13203,7 @@ const INIT_REACT_PACKAGE_JSON_DEPENDENCIES = {
 const INIT_REACT_PACKAGE_JSON_DEV_DEPENDENCIES = { "@types/bun": "latest" };
 const getInitReactPackageJsonDevDependencies = (options) => ({
 	...INIT_REACT_PACKAGE_JSON_DEV_DEPENDENCIES,
-	...options.backend === "concave" ? { "@concavejs/cli": "latest" } : {}
+	...options.backend === "concave" ? { "@concavejs/cli": SUPPORTED_DEPENDENCY_VERSIONS.concaveCli.exact } : {}
 });
 function renderInitReactPackageJsonTemplate(source, options = {}) {
 	const existing = source ? JSON.parse(source) : {};
@@ -15856,9 +15858,16 @@ function resolveCodegenTrimSegments(config) {
 function resolveConfiguredBackend(params) {
 	return params.backendArg ?? params.config?.backend ?? "convex";
 }
+function findConcavePkgPath() {
+	for (const searchPath of require.resolve.paths("@concavejs/cli") ?? []) {
+		const candidate = join(searchPath, "@concavejs", "cli", "package.json");
+		if (fs.existsSync(candidate)) return candidate;
+	}
+	throw new Error("Cannot find module '@concavejs/cli'.");
+}
 function resolveInstalledConcaveCliPath() {
 	try {
-		const concavePkgPath = require.resolve("@concavejs/cli/package.json");
+		const concavePkgPath = findConcavePkgPath();
 		const concavePkg = JSON.parse(fs.readFileSync(concavePkgPath, "utf8"));
 		const binRelative = typeof concavePkg.bin === "string" ? concavePkg.bin : concavePkg.bin?.concave;
 		if (!binRelative) throw new Error("Missing concave binary entry.");

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, At as highlighter, B as runConfiguredCodegen, C as isEntryPoint, Ct as formatDependencyInstallCommand, D as parseInitCommandArgs, E as parseBackendRunJson, Et as stripConvexCommandNoise, F as resolveRunDeps, G as runMigrationFlow, H as runDevSchemaBackfillIfNeeded, I as runAfterScaffoldScript, J as withWorkingDirectory, K as trackProcess, L as runAggregateBackfillFlow, M as resolveDocTopic, N as resolveInitProjectDir, O as readPackageVersions, P as resolveMigrationConfig, Q as promptForPluginSelection, R as runAggregatePruneFlow, S as isConvexDevPreRunConflictFlag, St as detectPackageManager, T as parseArgs, Tt as serializeEnvValue, U as runInitCommandFlow, V as runConvexInitIfNeeded, W as runMigrationCreate, X as collectPluginScaffoldTemplates, Y as createSpinner, Z as filterScaffoldTemplatePathMap, _ as formatInfoOutput, _t as applyPlanningDependencyInstall, a as cleanup, at as getPluginCatalogEntry, b as getDevAggregateBackfillStatePath, bt as resolveSupportedDependencyWarnings, c as createCommandEnv, ct as buildPluginInstallPlan, d as extractBackfillCliOptions, dt as collectInstalledPluginKeys, et as resolveAddTemplateDefaults, f as extractConcaveRunTargetArgs, ft as getPluginLockfilePath, g as formatDocsOutput, gt as applyDependencyHintsInstall, h as extractResetCliOptions, ht as resolveSchemaInstalledPlugins, i as buildInitializationPlan, it as resolveTemplatesByIdOrThrow, j as resolveConfiguredBackend, k as resolveBackfillConfig, kt as logger, l as ensureConvexGitignoreEntry, lt as resolvePluginScaffoldRoots, m as extractMigrationDownOptions, mt as readPluginLockfile, n as applyPluginInstallPlanFiles, nt as resolvePresetScaffoldTemplates, o as createBackendAdapter, ot as getSupportedPluginKeys, p as extractMigrationCliOptions, pt as getSchemaFilePath, q as withLocalCodegenEnv, r as assertNoRemovedDevPreRunFlag, rt as resolveTemplateSelectionSource, s as createBackendCommandEnv, st as isSupportedPluginKey, t as applyDependencyInstallPlan, tt as resolvePluginPreset, u as extractBackendRunTargetArgs, ut as assertSchemaFileExists, v as getAggregateBackfillDeploymentKey, vt as applyPluginDependencyInstall, w as isInitialized, wt as resolveAuthEnvState, x as hasRemoteConvexDeploymentEnv, xt as resolveProjectScaffoldContext, y as getConvexDeploymentCommandEnv, yt as inspectPluginDependencyInstall, z as runBackendFunction } from "./backend-core-D5P0hNYD.mjs";
+import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, At as highlighter, B as runConfiguredCodegen, C as isEntryPoint, Ct as formatDependencyInstallCommand, D as parseInitCommandArgs, E as parseBackendRunJson, Et as stripConvexCommandNoise, F as resolveRunDeps, G as runMigrationFlow, H as runDevSchemaBackfillIfNeeded, I as runAfterScaffoldScript, J as withWorkingDirectory, K as trackProcess, L as runAggregateBackfillFlow, M as resolveDocTopic, N as resolveInitProjectDir, O as readPackageVersions, P as resolveMigrationConfig, Q as promptForPluginSelection, R as runAggregatePruneFlow, S as isConvexDevPreRunConflictFlag, St as detectPackageManager, T as parseArgs, Tt as serializeEnvValue, U as runInitCommandFlow, V as runConvexInitIfNeeded, W as runMigrationCreate, X as collectPluginScaffoldTemplates, Y as createSpinner, Z as filterScaffoldTemplatePathMap, _ as formatInfoOutput, _t as applyPlanningDependencyInstall, a as cleanup, at as getPluginCatalogEntry, b as getDevAggregateBackfillStatePath, bt as resolveSupportedDependencyWarnings, c as createCommandEnv, ct as buildPluginInstallPlan, d as extractBackfillCliOptions, dt as collectInstalledPluginKeys, et as resolveAddTemplateDefaults, f as extractConcaveRunTargetArgs, ft as getPluginLockfilePath, g as formatDocsOutput, gt as applyDependencyHintsInstall, h as extractResetCliOptions, ht as resolveSchemaInstalledPlugins, i as buildInitializationPlan, it as resolveTemplatesByIdOrThrow, j as resolveConfiguredBackend, k as resolveBackfillConfig, kt as logger, l as ensureConvexGitignoreEntry, lt as resolvePluginScaffoldRoots, m as extractMigrationDownOptions, mt as readPluginLockfile, n as applyPluginInstallPlanFiles, nt as resolvePresetScaffoldTemplates, o as createBackendAdapter, ot as getSupportedPluginKeys, p as extractMigrationCliOptions, pt as getSchemaFilePath, q as withLocalCodegenEnv, r as assertNoRemovedDevPreRunFlag, rt as resolveTemplateSelectionSource, s as createBackendCommandEnv, st as isSupportedPluginKey, t as applyDependencyInstallPlan, tt as resolvePluginPreset, u as extractBackendRunTargetArgs, ut as assertSchemaFileExists, v as getAggregateBackfillDeploymentKey, vt as applyPluginDependencyInstall, w as isInitialized, wt as resolveAuthEnvState, x as hasRemoteConvexDeploymentEnv, xt as resolveProjectScaffoldContext, y as getConvexDeploymentCommandEnv, yt as inspectPluginDependencyInstall, z as runBackendFunction } from "./backend-core-qvNnNFFS.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import path, { delimiter, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";

package/dist/orm/index.js

@@ -3145,6 +3145,23 @@ const requiresMetricBackfill = (existingMetricDefinitionHash, targetMetricDefini
 	};
 	return hasMissing(targetStorage.sumFields, existingStorage.sumFields) || hasMissing(targetStorage.nonNullCountFields, existingStorage.nonNullCountFields) || hasMissing(targetStorage.extremaFields, existingStorage.extremaFields);
 };
+const listDistinctIndexTuples = async (db, tableName, indexName, fields) => {
+	const tuples = [];
+	let current = await db.query(tableName).withIndex(indexName).first();
+	while (current) {
+		const row = current;
+		const tuple = {};
+		for (const field of fields) tuple[field] = row[field];
+		tuples.push(tuple);
+		current = null;
+		for (let depth = fields.length - 1; depth >= 0 && !current; depth -= 1) current = await db.query(tableName).withIndex(indexName, (q) => {
+			let range = q;
+			for (let i = 0; i < depth; i += 1) range = range.eq(fields[i], tuple[fields[i]]);
+			return range.gt(fields[depth], tuple[fields[depth]]);
+		}).first();
+	}
+	return tuples;
+};
 function createCountBackfillHandlers(schema, getChunkRef) {
 	const serializeKey = (kind, tableName, indexName) => `${kind}\u0000${tableName}\u0000${indexName}`;
 	const pruneRemovedState = async (ctx, args, targets) => {
@@ -3152,9 +3169,13 @@ function createCountBackfillHandlers(schema, getChunkRef) {
 		const states = await ctx.db.query(AGGREGATE_STATE_TABLE).collect();
 		const stateByKey = new Map(states.map((state) => [serializeKey(state.kind === AGGREGATE_STATE_KIND_RANK ? "rank" : "metric", state.tableKey, state.indexName), state]));
 		const [bucketRows, memberRows, extremaRows] = await Promise.all([
-			ctx.db.query(AGGREGATE_BUCKET_TABLE).collect(),
-			ctx.db.query(AGGREGATE_MEMBER_TABLE).collect(),
-			ctx.db.query(AGGREGATE_EXTREMA_TABLE).collect()
+			listDistinctIndexTuples(ctx.db, AGGREGATE_BUCKET_TABLE, "by_table_index", ["tableKey", "indexName"]),
+			listDistinctIndexTuples(ctx.db, AGGREGATE_MEMBER_TABLE, "by_kind_table_index", [
+				"kind",
+				"tableKey",
+				"indexName"
+			]),
+			listDistinctIndexTuples(ctx.db, AGGREGATE_EXTREMA_TABLE, "by_table_index", ["tableKey", "indexName"])
 		]);
 		const existingKeys = /* @__PURE__ */ new Set();
 		for (const state of states) existingKeys.add(serializeKey(state.kind === AGGREGATE_STATE_KIND_RANK ? "rank" : "metric", state.tableKey, state.indexName));

package/dist/solid/index.d.ts

@@ -4,9 +4,10 @@ import { JSX, ParentProps } from "solid-js";
 import { DefaultError, QueryCache, QueryClient, QueryFilters, QueryFunction, QueryFunctionContext, QueryKey, SkipToken, SolidMutationOptions, SolidQueryOptions } from "@tanstack/solid-query";
 import { AuthTokenFetcher, ConvexClient, ConvexHttpClient } from "convex/browser";
 import { z } from "zod";
-import * as better_auth0 from "better-auth";
-import { BetterAuthClientPlugin, Session, User } from "better-auth";
+import { BetterAuthClientPlugin } from "better-auth/client";
 import { createAuthClient } from "better-auth/solid";
+import * as better_auth0 from "better-auth";
+import { Session, User } from "better-auth";
 import * as better_auth_api0 from "better-auth/api";
 import * as better_auth_plugins_oidc_provider0 from "better-auth/plugins/oidc-provider";
 import * as jose from "jose";
@@ -1186,8 +1187,11 @@ declare const convexClient: () => {
 };
 //#endregion
 //#region src/solid/types.d.ts
+type OpaqueClientPlugin = Omit<BetterAuthClientPlugin, '$InferServerPlugin'> & {
+  $InferServerPlugin?: never;
+};
 type ConvexClient$1 = ReturnType<typeof convexClient>;
-type CrossDomainClient = BetterAuthClientPlugin & {
+type CrossDomainClient = OpaqueClientPlugin & {
   id: 'cross-domain';
   getActions: (...args: never[]) => {
     crossDomain: {
@@ -1199,8 +1203,8 @@ type CrossDomainClient = BetterAuthClientPlugin & {
     notifySessionSignal: () => void;
   };
 };
-type PluginsWithCrossDomain = (CrossDomainClient | ConvexClient$1 | BetterAuthClientPlugin)[];
-type PluginsWithoutCrossDomain = (ConvexClient$1 | BetterAuthClientPlugin)[];
+type PluginsWithCrossDomain = (CrossDomainClient | ConvexClient$1 | OpaqueClientPlugin)[];
+type PluginsWithoutCrossDomain = (ConvexClient$1 | OpaqueClientPlugin)[];
 type SolidAuthSessionState = {
   data: unknown;
   error?: unknown;
@@ -1232,7 +1236,7 @@ type SolidAuthProviderClient = {
   updateSession?: (...args: never[]) => unknown;
   useSession: () => () => SolidAuthSessionState;
 } & Record<string, unknown>;
-type AuthClientWithPlugins<Plugins extends PluginsWithCrossDomain | PluginsWithoutCrossDomain> = ReturnType<typeof createAuthClient<{
+type AuthClientWithPlugins<Plugins extends BetterAuthClientPlugin[]> = ReturnType<typeof createAuthClient<{
   plugins: Plugins;
 }>>;
 type SolidAuthClient = AuthClientWithPlugins<PluginsWithCrossDomain> | AuthClientWithPlugins<PluginsWithoutCrossDomain>;

package/dist/watcher.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Dt as generateMeta, F as resolveRunDeps, Ot as getConvexConfig, j as resolveConfiguredBackend, kt as logger, q as withLocalCodegenEnv } from "./backend-core-D5P0hNYD.mjs";
+import { Dt as generateMeta, F as resolveRunDeps, Ot as getConvexConfig, j as resolveConfiguredBackend, kt as logger, q as withLocalCodegenEnv } from "./backend-core-qvNnNFFS.mjs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitcn",
-  "version": "0.15.13",
+  "version": "0.15.15",
   "description": "kitcn - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",