kitcn 0.17.0 → 0.17.2

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

@@ -1,4 +1,4 @@
-import { H as ConvexContext, W as LazyCaller } from "../../procedure-name-Bo5KMcqc.js";
+import { H as ConvexContext, W as LazyCaller } from "../../procedure-name-exVcmr_p.js";
 import { t as GetTokenOptions } from "../../token-B9Bjcqug.js";
 
 //#region src/auth-nextjs/index.d.ts

package/dist/{backend-core-BsKP1LVg.mjs → backend-core-KwJ5FZgj.mjs}

@@ -4798,12 +4798,21 @@ export function defineMigration(
 }
 `;
 }
+function renderRuntimeApiTypesImport(entries, importPath) {
+	const specifiers = [];
+	if (entries.some((entry) => !entry.internal)) specifiers.push("api as generatedApi");
+	if (entries.some((entry) => entry.internal)) specifiers.push("internal as generatedInternal");
+	if (specifiers.length === 0) return "";
+	if (specifiers.length === 1) return `import type { ${specifiers[0]} } from '${importPath}';\n`;
+	return `import type {\n${specifiers.map((specifier) => `  ${specifier},\n`).join("")}} from '${importPath}';\n`;
+}
 function emitGeneratedModuleRuntimeFile(outputFile, functionsDir, moduleName, procedureEntries, runtimeExportNames) {
 	const { callerExportName, handlerExportName } = runtimeExportNames?.get(moduleName) ?? getModuleRuntimeExportNames(moduleName);
 	const useGeneratedApiTypes = moduleUsesOwnGeneratedRuntime(functionsDir, moduleName);
 	const runtimeApiTypesImportPath = useGeneratedApiTypes ? getRuntimeApiTypesImportPath(outputFile, functionsDir) : null;
 	const generatedServerImportPath = getGeneratedServerImportPath(outputFile, functionsDir);
 	const { callerEntries, handlerEntries } = partitionRuntimeEntriesForEmission(procedureEntries);
+	const runtimeApiTypesImport = runtimeApiTypesImportPath ? renderRuntimeApiTypesImport(callerEntries, runtimeApiTypesImportPath) : "";
 	const callerRegistryLines = emitProcedureRegistryEntries(callerEntries, outputFile, functionsDir, moduleName, useGeneratedApiTypes);
 	const callerRegistryBody = callerRegistryLines.length > 0 ? `\n${callerRegistryLines.join("\n")}\n` : "\n";
 	const hasHandlerRegistry = handlerEntries.length > 0;
@@ -4852,11 +4861,7 @@ import {
   typedProcedureResolver,
   type GeneratedRegistryCallerForContext,${hasHandlerRegistry ? "\n  type GeneratedRegistryHandlerForContext," : ""}
 } from 'kitcn/server';
-${runtimeApiTypesImportPath ? `import type {
-  api as generatedApi,
-  internal as generatedInternal,
-} from '${runtimeApiTypesImportPath}';
-` : ""}import type { ActionCtx, MutationCtx, QueryCtx } from '${generatedServerImportPath}';
+${runtimeApiTypesImport}import type { ActionCtx, MutationCtx, QueryCtx } from '${generatedServerImportPath}';
 import type { OrmTriggerContext } from 'kitcn/orm';
 
 const procedureRegistry = {${callerRegistryBody}} as const;

package/dist/{builder-f4F_NRvK.js → builder-Dwy6D2QA.js}

@@ -795,46 +795,51 @@ function getApiErrorMessage(cause) {
 * Convert known framework/library errors into CRPCError.
 *
 * Intended for cRPC internals so callers don't need per-endpoint try/catch.
+*
+* Never assign `.stack` on a converted error. The Convex backend only forwards
+* `data` for a thrown error after it reads `__frameData` off it, and
+* `__frameData` is written as a side effect of the runtime's
+* `Error.prepareStackTrace` hook, which V8 runs lazily on the *first* read of
+* `.stack`. Assigning `.stack` satisfies later reads without ever running the
+* hook, so the backend bails out of source mapping and the client receives a
+* bare `Error` with the message redacted to `Server Error` and no `.data` —
+* losing the cRPC `code`, `message`, and custom payload. The original stack
+* stays reachable at `err.cause.stack`. See `error.vitest.ts`.
 */
 function toCRPCError(cause) {
 	if (cause instanceof CRPCError) return cause;
 	if (cause instanceof Error && cause.name === "CRPCError") return cause;
 	if (isConvexErrorLike(cause) && isCRPCErrorData(cause.data)) {
 		const { code, message, ...data } = cause.data;
-		const err = new CRPCError({
+		return new CRPCError({
 			code,
 			message,
 			cause,
 			data
 		});
-		if (cause.stack) err.stack = cause.stack;
-		return err;
-	}
-	if (isOrmNotFoundErrorLike(cause)) {
-		const err = new CRPCError({
-			code: "NOT_FOUND",
-			message: cause.message,
-			cause
-		});
-		if (cause.stack) err.stack = cause.stack;
-		return err;
 	}
+	if (isOrmNotFoundErrorLike(cause)) return new CRPCError({
+		code: "NOT_FOUND",
+		message: cause.message,
+		cause
+	});
 	if (isApiErrorLike(cause)) {
 		const status = cause.status;
 		const statusCode = cause.statusCode;
-		const err = new CRPCError({
+		return new CRPCError({
 			code: typeof status === "string" && status in CRPC_ERROR_CODES_BY_KEY ? status : typeof statusCode === "number" ? mapHttpStatusCodeToCRPCCode(statusCode) : "INTERNAL_SERVER_ERROR",
 			message: getApiErrorMessage(cause),
 			cause
 		});
-		if (cause.stack) err.stack = cause.stack;
-		return err;
 	}
 	return null;
 }
 /**
 * Wrap unknown error in CRPCError (from tRPC)
 *
+* The original stack stays reachable at `err.cause.stack`. See the note on
+* `toCRPCError` for why it must not be copied onto the returned error.
+*
 * @example
 * ```typescript
 * try {
@@ -847,12 +852,10 @@ function toCRPCError(cause) {
 function getCRPCErrorFromUnknown(cause) {
 	const handled = toCRPCError(cause);
 	if (handled) return handled;
-	const error = new CRPCError({
+	return new CRPCError({
 		code: "INTERNAL_SERVER_ERROR",
 		cause
 	});
-	if (cause instanceof Error && cause.stack) error.stack = cause.stack;
-	return error;
 }
 /**
 * Get HTTP status code from CRPCError

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, 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, jt as highlighter, 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-BsKP1LVg.mjs";
+import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, 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, jt as highlighter, 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-KwJ5FZgj.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/{middleware-Cgrv2jIu.js → middleware-qzHEHaDy.js}

@@ -1,4 +1,4 @@
-import { a as createMiddlewareFactory } from "./builder-f4F_NRvK.js";
+import { a as createMiddlewareFactory } from "./builder-Dwy6D2QA.js";
 
 //#region src/plugins/middleware.ts
 const PLUGIN_CONFIG_RESOLVERS = Symbol.for("kitcn:PluginConfigResolvers");

package/dist/plugins/index.js

@@ -1,3 +1,3 @@
-import { n as resolvePluginOptions, t as definePlugin } from "../middleware-Cgrv2jIu.js";
+import { n as resolvePluginOptions, t as definePlugin } from "../middleware-qzHEHaDy.js";
 
 export { definePlugin, resolvePluginOptions };

package/dist/{procedure-caller-Rj6z3ai7.js → procedure-caller-JB9kjYsy.js}

@@ -1,5 +1,5 @@
 import { i as decodeWire, o as encodeWire } from "./transformer-C6pGVHqx.js";
-import { _ as CRPCError } from "./builder-f4F_NRvK.js";
+import { _ as CRPCError } from "./builder-Dwy6D2QA.js";
 import { z } from "zod";
 
 //#region src/server/env.ts

package/dist/{procedure-name-Bo5KMcqc.d.ts → procedure-name-exVcmr_p.d.ts}

@@ -1184,11 +1184,24 @@ declare class CRPCError<TData extends Record<string, Value$1 | undefined> = Reco
  * Convert known framework/library errors into CRPCError.
  *
  * Intended for cRPC internals so callers don't need per-endpoint try/catch.
+ *
+ * Never assign `.stack` on a converted error. The Convex backend only forwards
+ * `data` for a thrown error after it reads `__frameData` off it, and
+ * `__frameData` is written as a side effect of the runtime's
+ * `Error.prepareStackTrace` hook, which V8 runs lazily on the *first* read of
+ * `.stack`. Assigning `.stack` satisfies later reads without ever running the
+ * hook, so the backend bails out of source mapping and the client receives a
+ * bare `Error` with the message redacted to `Server Error` and no `.data` —
+ * losing the cRPC `code`, `message`, and custom payload. The original stack
+ * stays reachable at `err.cause.stack`. See `error.vitest.ts`.
  */
 declare function toCRPCError(cause: unknown): CRPCError | null;
 /**
  * Wrap unknown error in CRPCError (from tRPC)
  *
+ * The original stack stays reachable at `err.cause.stack`. See the note on
+ * `toCRPCError` for why it must not be copied onto the returned error.
+ *
  * @example
  * ```typescript
  * try {

package/dist/ratelimit/index.js

@@ -1,6 +1,6 @@
 import { u as requireMutationCtx } from "../api-entry-N3nBOlI2.js";
-import { _ as CRPCError } from "../builder-f4F_NRvK.js";
-import { t as definePlugin } from "../middleware-Cgrv2jIu.js";
+import { _ as CRPCError } from "../builder-Dwy6D2QA.js";
+import { t as definePlugin } from "../middleware-qzHEHaDy.js";
 import { v } from "convex/values";
 import { mutationGeneric, queryGeneric } from "convex/server";
 

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as ActionProcedureBuilder, A as CRPCError, B as RuntimeEnv, C as createProcedureHandlerFactory, Ct as zCustomQuery, D as WithHttpRouter, Dt as zodToConvex, E as typedProcedureResolver, Et as zodOutputToConvexFields, F as getCRPCErrorFromUnknown, G as createLazyCaller, H as ConvexContext, I as getHTTPStatusCodeFromError, J as ServerCaller, K as CallerMeta, L as isCRPCError, M as CRPCErrorData, N as CRPC_ERROR_CODES_BY_KEY, O as inferApiInputs, Ot as zodToConvexFields, P as CRPC_ERROR_CODE_TO_HTTP, Q as getGeneratedValue, R as toCRPCError, S as createProcedureCallerFactory, St as zCustomMutation, T as getGeneratedFunctionReference, Tt as zodOutputToConvex, U as createCallerFactory, V as createEnv, W as LazyCaller, X as createApiLeaf, Y as createServerCaller, Z as createGeneratedFunctionReference, _ as ProcedureSchedulableCallerFromRegistry, _t as ZodValidatorFromConvex, a as CreateProcedureCallerFactoryOptions, at as initCRPC, b as createGenericCallerFactory, bt as withSystemFields, c as GeneratedRegistryCallerFactory, ct as extractPathParams, d as GeneratedRegistryHandlerForContext, dt as ConvexValidatorFromZod, et as CRPCFunctionTypeHint, f as ProcedureActionCallerFromRegistry, ft as ConvexValidatorFromZodOutput, g as ProcedureFromFunctionReference, gt as ZodFromValidatorBase, h as ProcedureDefinition, ht as Zid, i as registerProcedureNameLookup, it as createMiddlewareFactory, j as CRPCErrorCode, k as inferApiOutputs, l as GeneratedRegistryCallerForContext, lt as handleHttpError, m as ProcedureCallerFromRegistry, mt as ZCustomCtx, n as ProcedureNameLookup, nt as ProcedureBuilder, o as GeneratedProcedureRegistry, ot as HttpProcedureBuilder, p as ProcedureCaller, pt as CustomBuilder, q as CallerOpts, r as inferProcedureNameFromCallsite, rt as QueryProcedureBuilder, s as GeneratedProcedureRegistryEntry, st as createHttpProcedureBuilder, t as ProcedureNameEntry, tt as MutationProcedureBuilder, u as GeneratedRegistryHandlerFactory, ut as matchPathParams, v as ProcedureScheduleCallerFromRegistry, vt as convexToZod, w as defineProcedure, wt as zid, x as createGenericHandlerFactory, xt as zCustomAction, y as createGeneratedRegistryRuntime, yt as convexToZodFields, z as CreateEnvOptions } from "../procedure-name-Bo5KMcqc.js";
+import { $ as ActionProcedureBuilder, A as CRPCError, B as RuntimeEnv, C as createProcedureHandlerFactory, Ct as zCustomQuery, D as WithHttpRouter, Dt as zodToConvex, E as typedProcedureResolver, Et as zodOutputToConvexFields, F as getCRPCErrorFromUnknown, G as createLazyCaller, H as ConvexContext, I as getHTTPStatusCodeFromError, J as ServerCaller, K as CallerMeta, L as isCRPCError, M as CRPCErrorData, N as CRPC_ERROR_CODES_BY_KEY, O as inferApiInputs, Ot as zodToConvexFields, P as CRPC_ERROR_CODE_TO_HTTP, Q as getGeneratedValue, R as toCRPCError, S as createProcedureCallerFactory, St as zCustomMutation, T as getGeneratedFunctionReference, Tt as zodOutputToConvex, U as createCallerFactory, V as createEnv, W as LazyCaller, X as createApiLeaf, Y as createServerCaller, Z as createGeneratedFunctionReference, _ as ProcedureSchedulableCallerFromRegistry, _t as ZodValidatorFromConvex, a as CreateProcedureCallerFactoryOptions, at as initCRPC, b as createGenericCallerFactory, bt as withSystemFields, c as GeneratedRegistryCallerFactory, ct as extractPathParams, d as GeneratedRegistryHandlerForContext, dt as ConvexValidatorFromZod, et as CRPCFunctionTypeHint, f as ProcedureActionCallerFromRegistry, ft as ConvexValidatorFromZodOutput, g as ProcedureFromFunctionReference, gt as ZodFromValidatorBase, h as ProcedureDefinition, ht as Zid, i as registerProcedureNameLookup, it as createMiddlewareFactory, j as CRPCErrorCode, k as inferApiOutputs, l as GeneratedRegistryCallerForContext, lt as handleHttpError, m as ProcedureCallerFromRegistry, mt as ZCustomCtx, n as ProcedureNameLookup, nt as ProcedureBuilder, o as GeneratedProcedureRegistry, ot as HttpProcedureBuilder, p as ProcedureCaller, pt as CustomBuilder, q as CallerOpts, r as inferProcedureNameFromCallsite, rt as QueryProcedureBuilder, s as GeneratedProcedureRegistryEntry, st as createHttpProcedureBuilder, t as ProcedureNameEntry, tt as MutationProcedureBuilder, u as GeneratedRegistryHandlerFactory, ut as matchPathParams, v as ProcedureScheduleCallerFromRegistry, vt as convexToZod, w as defineProcedure, wt as zid, x as createGenericHandlerFactory, xt as zCustomAction, y as createGeneratedRegistryRuntime, yt as convexToZodFields, z as CreateEnvOptions } from "../procedure-name-exVcmr_p.js";
 import { C as HttpProcedure, D as ProcedureMeta, E as InferHttpInput, S as HttpMethod, T as HttpRouteDefinition, _ as extractRouteMap, b as HttpActionHandler, d as CRPCHttpRouter, f as HttpRouterDef, g as createHttpRouterFactory, h as createHttpRouter, m as HttpRouterWithHono, p as HttpRouterRecord, v as CRPCHonoHandler, w as HttpProcedureBuilderDef, x as HttpHandlerOpts, y as HttpActionConstructor } from "../http-types-zsMHb_QN.js";
 import { a as MergeZodObjects, c as MiddlewareMarker, d as MiddlewareProcedureType, f as MiddlewareResult, g as UnsetMarker, h as Simplify, i as IntersectIfDefined, l as MiddlewareNext, m as ResolveIfSet, n as AnyMiddlewareBuilder, o as MiddlewareBuilder, p as Overwrite, r as GetRawInputFn, s as MiddlewareFunction, t as AnyMiddleware, u as MiddlewareProcedureInfo } from "../types-CnTpHR1F.js";
 import { a as isMutationCtx, c as isSchedulerCtx, d as requireQueryCtx, f as requireRunMutationCtx, i as isActionCtx, l as requireActionCtx, n as RunMutationCtx, o as isQueryCtx, p as requireSchedulerCtx, r as SchedulerCtx, s as isRunMutationCtx, t as GenericCtx, u as requireMutationCtx } from "../context-utils-BBUtBqjN.js";

package/dist/server/index.js

@@ -1,6 +1,6 @@
 import { a as isMutationCtx, c as isSchedulerCtx, d as requireQueryCtx, f as requireRunMutationCtx, i as isActionCtx, l as requireActionCtx, n as createGeneratedFunctionReference, o as isQueryCtx, p as requireSchedulerCtx, r as getGeneratedValue, s as isRunMutationCtx, t as createApiLeaf, u as requireMutationCtx } from "../api-entry-N3nBOlI2.js";
 import { n as createLazyCaller, r as createServerCaller, t as createCallerFactory } from "../caller-factory-DHywSoGZ.js";
-import { A as zid, C as toCRPCError, D as zCustomAction, E as withSystemFields, M as zodOutputToConvexFields, N as zodToConvex, O as zCustomMutation, P as zodToConvexFields, S as isCRPCError, T as convexToZodFields, _ as CRPCError, a as createMiddlewareFactory, b as getCRPCErrorFromUnknown, c as registerProcedureNameLookup, d as createHttpRouterFactory, f as extractRouteMap, g as matchPathParams, h as handleHttpError, i as QueryProcedureBuilder, j as zodOutputToConvex, k as zCustomQuery, l as HttpRouterWithHono, m as extractPathParams, n as MutationProcedureBuilder, o as initCRPC, p as createHttpProcedureBuilder, r as ProcedureBuilder, s as inferProcedureNameFromCallsite, t as ActionProcedureBuilder, u as createHttpRouter, v as CRPC_ERROR_CODES_BY_KEY, w as convexToZod, x as getHTTPStatusCodeFromError, y as CRPC_ERROR_CODE_TO_HTTP } from "../builder-f4F_NRvK.js";
-import { a as createProcedureHandlerFactory, c as typedProcedureResolver, i as createProcedureCallerFactory, l as createEnv, n as createGenericCallerFactory, o as defineProcedure, r as createGenericHandlerFactory, s as getGeneratedFunctionReference, t as createGeneratedRegistryRuntime } from "../procedure-caller-Rj6z3ai7.js";
+import { A as zid, C as toCRPCError, D as zCustomAction, E as withSystemFields, M as zodOutputToConvexFields, N as zodToConvex, O as zCustomMutation, P as zodToConvexFields, S as isCRPCError, T as convexToZodFields, _ as CRPCError, a as createMiddlewareFactory, b as getCRPCErrorFromUnknown, c as registerProcedureNameLookup, d as createHttpRouterFactory, f as extractRouteMap, g as matchPathParams, h as handleHttpError, i as QueryProcedureBuilder, j as zodOutputToConvex, k as zCustomQuery, l as HttpRouterWithHono, m as extractPathParams, n as MutationProcedureBuilder, o as initCRPC, p as createHttpProcedureBuilder, r as ProcedureBuilder, s as inferProcedureNameFromCallsite, t as ActionProcedureBuilder, u as createHttpRouter, v as CRPC_ERROR_CODES_BY_KEY, w as convexToZod, x as getHTTPStatusCodeFromError, y as CRPC_ERROR_CODE_TO_HTTP } from "../builder-Dwy6D2QA.js";
+import { a as createProcedureHandlerFactory, c as typedProcedureResolver, i as createProcedureCallerFactory, l as createEnv, n as createGenericCallerFactory, o as defineProcedure, r as createGenericHandlerFactory, s as getGeneratedFunctionReference, t as createGeneratedRegistryRuntime } from "../procedure-caller-JB9kjYsy.js";
 
 export { ActionProcedureBuilder, CRPCError, CRPC_ERROR_CODES_BY_KEY, CRPC_ERROR_CODE_TO_HTTP, HttpRouterWithHono, MutationProcedureBuilder, ProcedureBuilder, QueryProcedureBuilder, convexToZod, convexToZodFields, createApiLeaf, createCallerFactory, createEnv, createGeneratedFunctionReference, createGeneratedRegistryRuntime, createGenericCallerFactory, createGenericHandlerFactory, createHttpProcedureBuilder, createHttpRouter, createHttpRouterFactory, createLazyCaller, createMiddlewareFactory, createProcedureCallerFactory, createProcedureHandlerFactory, createServerCaller, defineProcedure, extractPathParams, extractRouteMap, getCRPCErrorFromUnknown, getGeneratedFunctionReference, getGeneratedValue, getHTTPStatusCodeFromError, handleHttpError, inferProcedureNameFromCallsite, initCRPC, isActionCtx, isCRPCError, isMutationCtx, isQueryCtx, isRunMutationCtx, isSchedulerCtx, matchPathParams, registerProcedureNameLookup, requireActionCtx, requireMutationCtx, requireQueryCtx, requireRunMutationCtx, requireSchedulerCtx, toCRPCError, typedProcedureResolver, withSystemFields, zCustomAction, zCustomMutation, zCustomQuery, zid, zodOutputToConvex, zodOutputToConvexFields, zodToConvex, zodToConvexFields };

package/dist/solid/index.js

@@ -1,10 +1,10 @@
 import { getFunctionName } from "convex/server";
-import { Show, createContext, createEffect, createMemo, createSignal, on, onCleanup, onMount, useContext } from "solid-js";
+import { Show, createComputed, createContext, createEffect, createMemo, createRenderEffect, createSignal, on, onCleanup, onMount, useContext } from "solid-js";
 import { createComponent, memo } from "solid-js/web";
 import { createStore } from "solid-js/store";
-import { notifyManager, skipToken, useQueries, useQueryClient } from "@tanstack/solid-query";
+import { notifyManager, skipToken, useQueryClient } from "@tanstack/solid-query";
 import { ConvexClient, ConvexHttpClient } from "convex/browser";
-import { hashKey } from "@tanstack/query-core";
+import { QueriesObserver, hashKey } from "@tanstack/query-core";
 import { convexToJson } from "convex/values";
 
 //#region src/crpc/error.ts
@@ -2504,6 +2504,42 @@ const getConvexQueryClientSingleton = ({ authStore, convex, queryClient, symbolK
 //#region src/internal/pagination.ts
 const shouldSplitPaginationPage = (page, initialNumItems) => Boolean(page.splitCursor) && (page.pageStatus === "SplitRecommended" || page.pageStatus === "SplitRequired" || initialNumItems !== void 0 && page.page.length > initialNumItems * 2);
 
+//#endregion
+//#region src/solid/create-queries-results.ts
+/**
+* Subscribe a reactive list of queries and expose the raw observer results.
+*
+* Solid Query's `useQueries` cannot back an aggregate result: it feeds the
+* `combine` output straight into `createStore` and then calls `.map()` on it,
+* so any non-array aggregate throws `state.map is not a function` while the
+* component is still setting up. It also routes `.data` through
+* `createResource`, which suspends the nearest boundary for as long as a query
+* is in flight.
+*
+* Driving `QueriesObserver` directly keeps every entry a plain
+* `QueryObserverResult` - the same value the React port aggregates - and leaves
+* aggregation to the caller.
+*
+* @param queries Reactive list of query options.
+* @returns Accessor for the raw observer results, in query order.
+*/
+function createQueriesResults(queries) {
+	const queryClient = useQueryClient();
+	const defaulted = () => queries().map((options) => ({
+		...queryClient.defaultQueryOptions(options),
+		_optimisticResults: "optimistic"
+	}));
+	const observer = new QueriesObserver(queryClient, defaulted());
+	const [results, setResults] = createSignal(observer.getCurrentResult(), { equals: false });
+	createComputed(() => {
+		const next = defaulted();
+		observer.setQueries(next);
+		setResults(observer.getOptimisticResult(next, void 0)[0]);
+	});
+	onCleanup(observer.subscribe((next) => setResults(next)));
+	return results;
+}
+
 //#endregion
 //#region src/solid/use-infinite-query.ts
 const PAGINATION_KEY_PREFIX = "__pagination__";
@@ -2516,6 +2552,59 @@ const getOrCreatePaginationId = (storeKey) => {
 	paginationIdStore.set(storeKey, newId);
 	return newId;
 };
+/** Read the identity of a Convex document, tolerating `id` and `_id` shapes */
+const getItemId = (item) => {
+	const doc = item;
+	return doc?._id || doc?.id;
+};
+/**
+* Fold the per-page observer results into one pagination-shaped aggregate.
+* Pure: same inputs always produce the same output, so it is safe to re-run
+* inside a reactive derivation.
+*/
+const aggregatePages = (results, hasPlaceholderData) => {
+	const allItems = [];
+	const pages = [];
+	const seenIds = /* @__PURE__ */ new Set();
+	let lastPage;
+	let status = "LoadingFirstPage";
+	for (let i = 0; i < results.length; i++) {
+		const pageQuery = results[i];
+		if (pageQuery.isLoading || pageQuery.data === void 0) {
+			status = i === 0 ? "LoadingFirstPage" : "LoadingMore";
+			break;
+		}
+		const page = pageQuery.data;
+		lastPage = page;
+		pages.push(page.page);
+		for (const item of page.page) {
+			const id = getItemId(item);
+			if (id && seenIds.has(id)) continue;
+			if (id) seenIds.add(id);
+			allItems.push(item);
+		}
+		status = page.isDone ? "Exhausted" : "CanLoadMore";
+	}
+	const firstPage = results.length > 0 ? results[0] : void 0;
+	const isPlaceholderData = firstPage ? firstPage.isPlaceholderData : hasPlaceholderData;
+	const isFetching = results.some((r) => r.isFetching);
+	const error = results.find((r) => r.isError)?.error ?? null;
+	return {
+		data: allItems,
+		dataUpdatedAt: Math.max(...results.map((r) => r.dataUpdatedAt)),
+		error,
+		failureReason: error,
+		isError: results.some((r) => r.isError),
+		isFetchNextPageError: results.length > 1 && (results.at(-1)?.isError ?? false),
+		isFetching,
+		isLoading: status === "LoadingFirstPage",
+		isPlaceholderData,
+		isRefetching: isFetching && allItems.length > 0 && !isPlaceholderData,
+		lastPage,
+		pages,
+		status
+	};
+};
 /** Build a unique key for recovery attempt detection */
 const buildRecoveryKey = (pageKeys, page0Cursor, page0UpdatedAt) => JSON.stringify({
 	pageKeys,
@@ -2531,26 +2620,27 @@ const buildRecoveryKey = (pageKeys, page0Cursor, page0UpdatedAt) => JSON.stringi
 * This hook detects this pattern and creates a recovery page that fetches
 * enough items to cover the lost pages, preserving the user's scroll position.
 */
-const useStaleCursorRecovery = ({ argsObject, combined, limit, setState, state }) => {
+const useStaleCursorRecovery = ({ argsObject, combined, limit, pageResults, setState, state }) => {
 	createEffect(on([
 		() => combined.isFetchNextPageError,
-		() => combined._rawResults,
+		pageResults,
 		() => state().pageKeys,
 		() => state().queries,
 		() => state().autoRecoveryAttempted,
 		argsObject
 	], () => {
 		if (!combined.isFetchNextPageError) return;
-		const page0Result = combined._rawResults[0];
+		const results = pageResults();
+		const page0Result = results[0];
 		const page0Data = page0Result?.data;
 		const page0UpdatedAt = page0Result?.dataUpdatedAt ?? 0;
 		const hasPage0Data = page0Data !== void 0 && !page0Result?.isError;
-		const hasSubsequentErrors = combined._rawResults.slice(1).some((q) => q?.isError && !q?.isFetching);
+		const hasSubsequentErrors = results.slice(1).some((q) => q?.isError && !q?.isFetching);
 		if (!hasPage0Data || !hasSubsequentErrors || !page0Data?.continueCursor) return;
 		const currentState = state();
 		const recoveryKey = buildRecoveryKey(currentState.pageKeys, page0Data.continueCursor, page0UpdatedAt);
 		if (currentState.autoRecoveryAttempted === recoveryKey) return;
-		const erroredPageKeys = currentState.pageKeys.filter((_, i) => i > 0 && combined._rawResults[i]?.isError);
+		const erroredPageKeys = currentState.pageKeys.filter((_, i) => i > 0 && results[i]?.isError);
 		const itemsToRecover = erroredPageKeys.reduce((sum, key) => {
 			return sum + (currentState.queries[key]?.args?.limit ?? limit ?? 20);
 		}, 0);
@@ -2711,66 +2801,27 @@ const useInfiniteQueryInternal = (query, args, options) => {
 			} } : {}
 		};
 	}));
-	const combined = useQueries(() => ({
-		queries: tanstackQueries(),
-		combine: (results) => {
-			const allItems = [];
-			const pages = [];
-			const seenIds = /* @__PURE__ */ new Set();
-			let lastPage;
-			let paginationStatus = "LoadingFirstPage";
-			for (let i = 0; i < results.length; i++) {
-				const pageQuery = results[i];
-				if (pageQuery.isLoading || pageQuery.data === void 0) {
-					paginationStatus = i === 0 ? "LoadingFirstPage" : "LoadingMore";
-					break;
-				}
-				const page = pageQuery.data;
-				lastPage = page;
-				pages.push(page.page);
-				for (const item of page.page) {
-					const id = item._id || item.id;
-					if (id && seenIds.has(id)) continue;
-					if (id) seenIds.add(id);
-					allItems.push(item);
-				}
-				paginationStatus = page.isDone ? "Exhausted" : "CanLoadMore";
-			}
-			const isPlaceholderData = results[0]?.isPlaceholderData ?? !!placeholderData;
-			const isFetching = results.some((r) => r.isFetching);
-			return {
-				data: allItems,
-				dataUpdatedAt: Math.max(...results.map((r) => r.dataUpdatedAt ?? 0)),
-				lastPage,
-				pages,
-				status: paginationStatus,
-				error: results.find((r) => r.isError)?.error ?? null,
-				isError: results.some((r) => r.isError),
-				isFetching,
-				isFetchNextPageError: results.length > 1 && (results.at(-1)?.isError ?? false),
-				isPlaceholderData,
-				isRefetching: isFetching && allItems.length > 0 && !isPlaceholderData,
-				isLoading: paginationStatus === "LoadingFirstPage",
-				failureReason: results.find((r) => r.isError)?.error ?? null,
-				_rawResults: results
-			};
-		}
-	}));
+	const pageResults = createQueriesResults(() => tanstackQueries());
+	const derive = () => aggregatePages(pageResults(), !!placeholderData);
+	const [combined, setCombined] = createStore(derive());
+	createRenderEffect(() => setCombined(derive()));
 	useStaleCursorRecovery({
 		argsObject,
 		combined,
 		limit,
+		pageResults,
 		setState,
 		state
 	});
 	createEffect(on([
-		() => combined._rawResults,
+		pageResults,
 		() => state().pageKeys,
 		() => state().queries,
 		argsObject
 	], () => {
-		for (let i = 0; i < combined._rawResults.length; i++) {
-			const pageQuery = combined._rawResults[i];
+		const results = pageResults();
+		for (let i = 0; i < results.length; i++) {
+			const pageQuery = results[i];
 			if (pageQuery.data) {
 				const page = pageQuery.data;
 				const pageKey = state().pageKeys[i];

package/dist/watcher.mjs

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

package/package.json

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