better-convex 0.6.4 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",
@@ -12,10 +12,12 @@
   "sideEffects": false,
   "type": "module",
   "exports": {
+    "./aggregate": "./dist/aggregate/index.js",
     "./auth": "./dist/auth/index.js",
-    "./auth-client": "./dist/auth-client/index.js",
-    "./auth-config": "./dist/auth-config/index.js",
-    "./auth-nextjs": "./dist/auth-nextjs/index.js",
+    "./auth/client": "./dist/auth/client/index.js",
+    "./auth/config": "./dist/auth/config/index.js",
+    "./auth/http": "./dist/auth/http/index.js",
+    "./auth/nextjs": "./dist/auth/nextjs/index.js",
     "./crpc": "./dist/crpc/index.js",
     "./orm": "./dist/orm/index.js",
     "./react": "./dist/react/index.js",
@@ -37,27 +39,29 @@
     "typecheck:types": "tsc --project ../../convex/test-types/tsconfig.json"
   },
   "dependencies": {
+    "@clack/prompts": "^0.11.0",
     "@convex-dev/better-auth": "^0.10.10",
     "chokidar": "^5.0.0",
     "common-tags": "^1.8.2",
-    "dotenv": "^17.2.3",
+    "dotenv": "^17.3.1",
+    "esbuild": "^0.27.3",
     "execa": "^9.6.1",
     "jiti": "^2.6.1",
-    "jotai": "^2.17.0",
+    "jotai": "^2.18.0",
     "jotai-x": "^2.3.3",
     "picocolors": "^1.1.1",
-    "remeda": "^2.33.4",
-    "type-fest": "^5.4.2"
+    "remeda": "^2.33.6",
+    "type-fest": "^5.4.4"
   },
   "devDependencies": {
     "@rollup/plugin-babel": "^6.1.0",
     "babel-plugin-react-compiler": "^1.0.0",
-    "tsdown": "^0.20.1"
+    "tsdown": "^0.20.3"
   },
   "peerDependencies": {
     "@tanstack/react-query": ">=5",
     "better-auth": ">=1.4.9",
-    "convex": ">=1.31",
+    "convex": ">=1.32",
     "hono": ">=4",
     "next": ">=14",
     "react": ">=18",

package/dist/codegen-DkpPBVPn.mjs

@@ -1,189 +0,0 @@
-#!/usr/bin/env node
-import fs from "node:fs";
-import path from "node:path";
-import { createJiti } from "jiti";
-
-//#region src/shared/meta-utils.ts
-/** Files to exclude from meta generation */
-const EXCLUDED_FILES = new Set([
-	"schema.ts",
-	"convex.config.ts",
-	"auth.config.ts"
-]);
-/**
-* Check if a file path should be included in meta generation.
-* Filters out private files/directories (prefixed with _) and config files.
-*/
-function isValidConvexFile(file) {
-	if (file.startsWith("_") || file.includes("/_")) return false;
-	const basename = file.split("/").pop() ?? "";
-	if (EXCLUDED_FILES.has(basename)) return false;
-	return true;
-}
-
-//#endregion
-//#region src/cli/codegen.ts
-/** Valid JS identifier pattern for object keys */
-const VALID_IDENTIFIER_RE = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
-/** Pattern to strip .ts extension */
-const TS_EXTENSION_RE = /\.ts$/;
-function listFilesRecursive(cwd, relDir = "") {
-	const absDir = path.join(cwd, relDir);
-	const entries = fs.readdirSync(absDir, { withFileTypes: true });
-	const files = [];
-	for (const entry of entries) {
-		const relPath = relDir ? `${relDir}/${entry.name}` : entry.name;
-		if (entry.isDirectory()) {
-			files.push(...listFilesRecursive(cwd, relPath));
-			continue;
-		}
-		if (entry.isFile()) files.push(relPath);
-	}
-	return files;
-}
-function getConvexConfig(outputDir) {
-	const convexConfigPath = path.join(process.cwd(), "convex.json");
-	const functionsDir = (fs.existsSync(convexConfigPath) ? JSON.parse(fs.readFileSync(convexConfigPath, "utf-8")) : {}).functions || "convex";
-	return {
-		functionsDir: path.join(process.cwd(), functionsDir),
-		outputFile: path.join(process.cwd(), outputDir || "convex/shared", "meta.ts")
-	};
-}
-/**
-* Check if a value is a CRPCHttpRouter (has _def.router === true)
-*/
-function isCRPCHttpRouter(value) {
-	return typeof value === "object" && value !== null && "_def" in value && value._def?.router === true;
-}
-/**
-* Import a module using jiti and extract CRPC metadata from exports
-*/
-async function parseModuleRuntime(filePath, jitiInstance) {
-	const result = {};
-	const httpRoutes = {};
-	const isHttp = filePath.endsWith("http.ts");
-	const module = await jitiInstance.import(filePath);
-	if (!module || typeof module !== "object") {
-		if (isHttp) console.error("  http.ts: module is empty or not an object");
-		return {
-			meta: null,
-			httpRoutes: {}
-		};
-	}
-	for (const [name, value] of Object.entries(module)) {
-		if (name.startsWith("_")) continue;
-		const meta = value?._crpcMeta;
-		if (meta?.type) {
-			if (meta.internal) continue;
-			const fnMeta = { type: meta.type };
-			if (meta.auth) fnMeta.auth = meta.auth;
-			for (const [key, val] of Object.entries(meta)) if (key !== "type" && key !== "internal" && val !== void 0) fnMeta[key] = val;
-			result[name] = fnMeta;
-		}
-		const httpRoute = value?._crpcHttpRoute;
-		if (httpRoute?.path && httpRoute?.method) httpRoutes[name] = {
-			path: httpRoute.path,
-			method: httpRoute.method
-		};
-		if (isCRPCHttpRouter(value)) for (const [procPath, procedure] of Object.entries(value._def.procedures)) {
-			const route = procedure._crpcHttpRoute;
-			if (route?.path && route?.method) httpRoutes[procPath] = {
-				path: route.path,
-				method: route.method
-			};
-		}
-	}
-	return {
-		meta: Object.keys(result).length > 0 ? result : null,
-		httpRoutes
-	};
-}
-async function generateMeta(outputDir, options) {
-	const startTime = Date.now();
-	const { functionsDir, outputFile } = getConvexConfig(outputDir);
-	const debug = options?.debug ?? false;
-	const silent = options?.silent ?? false;
-	if (debug) console.info("🔍 Scanning Convex functions for metadata...\n");
-	const jitiInstance = createJiti(process.cwd(), {
-		interopDefault: true,
-		moduleCache: false
-	});
-	const meta = {};
-	const allHttpRoutes = {};
-	let totalFunctions = 0;
-	const files = listFilesRecursive(functionsDir).filter((file) => file.endsWith(".ts") && isValidConvexFile(file));
-	for (const file of files) {
-		const filePath = path.join(functionsDir, file);
-		const moduleName = file.replace(TS_EXTENSION_RE, "");
-		try {
-			const { meta: moduleMeta, httpRoutes } = await parseModuleRuntime(filePath, jitiInstance);
-			if (moduleMeta) {
-				meta[moduleName] = moduleMeta;
-				const fnCount = Object.keys(moduleMeta).length;
-				totalFunctions += fnCount;
-				if (debug) console.info(`  ✓ ${moduleName}: ${fnCount} functions`);
-			}
-			if (Object.keys(httpRoutes).length > 0 && debug) console.info(`  ✓ ${moduleName}: ${Object.keys(httpRoutes).length} HTTP routes`);
-			Object.assign(allHttpRoutes, httpRoutes);
-		} catch (error) {
-			if (debug || file === "http.ts") console.error(`  ⚠ Failed to parse ${file}:`, error);
-		}
-	}
-	const formatKey = (key) => VALID_IDENTIFIER_RE.test(key) ? key : `'${key}'`;
-	const metaEntries = Object.entries(meta).map(([module, fns]) => {
-		const fnEntries = Object.entries(fns).map(([fn, fnMeta]) => {
-			const metaProps = [];
-			for (const [key, value] of Object.entries(fnMeta).sort()) {
-				if (value === void 0) continue;
-				if (typeof value === "string") metaProps.push(`${key}: '${value}'`);
-				else if (typeof value === "boolean") metaProps.push(`${key}: ${value}`);
-				else if (typeof value === "number") metaProps.push(`${key}: ${value}`);
-			}
-			return `    ${fn}: ${`{ ${metaProps.join(", ")} }`}`;
-		}).join(",\n");
-		return `  ${formatKey(module)}: {\n${fnEntries},\n  }`;
-	}).join(",\n");
-	const metaContent = metaEntries ? `\n${metaEntries},\n` : "";
-	const routesByPath = /* @__PURE__ */ new Map();
-	for (const [key, route] of Object.entries(allHttpRoutes)) {
-		const pathKey = `${route.path}:${route.method}`;
-		const existing = routesByPath.get(pathKey) || [];
-		existing.push({
-			key,
-			route
-		});
-		routesByPath.set(pathKey, existing);
-	}
-	const dedupedRoutes = {};
-	for (const entries of routesByPath.values()) {
-		const best = entries.reduce((a, b) => a.key.length >= b.key.length ? a : b);
-		dedupedRoutes[best.key] = best.route;
-	}
-	const httpEntries = Object.entries(dedupedRoutes).sort(([a], [b]) => a.localeCompare(b)).map(([name, route]) => `    ${formatKey(name)}: { path: '${route.path}', method: '${route.method}' }`).join(",\n");
-	const httpContent = httpEntries ? `\n${httpEntries},\n  ` : "";
-	const output = `// biome-ignore-all format: generated
-// This file is auto-generated by better-convex
-// Do not edit manually. Run \`better-convex codegen\` to regenerate.
-
-export const meta = {${metaContent ? `${metaContent}  _http: {${httpContent}},\n` : `\n  _http: {${httpContent}},\n`}} as const;
-
-export type Meta = typeof meta;
-`;
-	const metaDir = path.dirname(outputFile);
-	if (!fs.existsSync(metaDir)) fs.mkdirSync(metaDir, { recursive: true });
-	fs.writeFileSync(outputFile, output);
-	const elapsed = ((Date.now() - startTime) / 1e3).toFixed(2);
-	const time = (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", {
-		hour12: false,
-		hour: "2-digit",
-		minute: "2-digit",
-		second: "2-digit"
-	});
-	if (!silent) if (debug) {
-		console.info(`\n✅ Generated ${outputFile}`);
-		console.info(`   ${Object.keys(meta).length} modules, ${totalFunctions} functions`);
-	} else console.info(`✔ ${time} Convex meta ready! (${elapsed}s)`);
-}
-
-//#endregion
-export { getConvexConfig as n, generateMeta as t };

package/dist/context-utils-DSuX99Da.d.ts

@@ -1,17 +0,0 @@
-import { GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx } from "convex/server";
-
-//#region src/server/context-utils.d.ts
-type GenericCtx<DataModel extends GenericDataModel = GenericDataModel> = GenericQueryCtx<DataModel> | GenericMutationCtx<DataModel> | GenericActionCtx<DataModel>;
-type RunMutationCtx<DataModel extends GenericDataModel> = (GenericMutationCtx<DataModel> | GenericActionCtx<DataModel>) & {
-  runMutation: GenericMutationCtx<DataModel>['runMutation'];
-};
-declare const isQueryCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => ctx is GenericQueryCtx<DataModel>;
-declare const isMutationCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => ctx is GenericMutationCtx<DataModel>;
-declare const isActionCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => ctx is GenericActionCtx<DataModel>;
-declare const isRunMutationCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => ctx is RunMutationCtx<DataModel>;
-declare const requireQueryCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => GenericQueryCtx<DataModel>;
-declare const requireMutationCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => GenericMutationCtx<DataModel>;
-declare const requireActionCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => GenericActionCtx<DataModel>;
-declare const requireRunMutationCtx: <DataModel extends GenericDataModel>(ctx: GenericCtx<DataModel>) => RunMutationCtx<DataModel>;
-//#endregion
-export { isQueryCtx as a, requireMutationCtx as c, isMutationCtx as i, requireQueryCtx as l, RunMutationCtx as n, isRunMutationCtx as o, isActionCtx as r, requireActionCtx as s, GenericCtx as t, requireRunMutationCtx as u };

package/dist/meta-utils-DCpLSBWB.js

@@ -1,41 +0,0 @@
-//#region src/shared/meta-utils.ts
-/**
-* Get a function reference from the API object by traversing the path.
-*/
-function getFuncRef(api, path) {
-	let current = api;
-	for (const key of path) if (current && typeof current === "object") current = current[key];
-	else throw new Error(`Invalid path: ${path.join(".")}`);
-	return current;
-}
-/**
-* Get function type from meta using path.
-* Supports nested paths like ['items', 'queries', 'list'] → namespace='items/queries', fn='list'
-*
-* @param path - Path segments like ['todos', 'create'] or ['items', 'queries', 'list']
-* @param meta - The meta object from codegen
-* @returns Function type or 'query' as default
-*/
-function getFunctionType(path, meta) {
-	if (path.length < 2) return "query";
-	const fnName = path.at(-1);
-	const fnType = meta[path.slice(0, -1).join("/")]?.[fnName]?.type;
-	if (fnType === "query" || fnType === "mutation" || fnType === "action") return fnType;
-	return "query";
-}
-/**
-* Get function metadata from meta using path.
-* Supports nested paths like ['items', 'queries', 'list'] → namespace='items/queries', fn='list'
-*
-* @param path - Path segments like ['todos', 'create'] or ['items', 'queries', 'list']
-* @param meta - The meta object from codegen
-* @returns Function metadata or undefined
-*/
-function getFunctionMeta(path, meta) {
-	if (path.length < 2) return;
-	const fnName = path.at(-1);
-	return meta[path.slice(0, -1).join("/")]?.[fnName];
-}
-
-//#endregion
-export { getFunctionMeta as n, getFunctionType as r, getFuncRef as t };