ignotum 0.0.10 → 0.0.12

package/dist/runtime/{api-jCl8Hzry.d.ts → api-5XSrIeqW.d.ts}

@@ -1,5 +1,6 @@
-import { a as InternalServerError, g as FileValue, i as ErrorValue } from "./id-Cs82tq9Q-Caqfx54f.js";
-import { t as FunctionAddress } from "./sync-bMQq9tXx.js";
+import { a as InternalServerError, g as FileValue, i as ErrorValue } from "./id-Cs82tq9Q-CK-maMgN.js";
+import "./result-DIjKM-p4.js";
+import { t as FunctionAddress } from "./sync-avN7NkcU.js";
 import { Effect } from "effect";
 //#region src/internal/api.d.ts
 declare const FunctionReferenceTypeId: unique symbol;
@@ -42,4 +43,4 @@ declare const functionPathOf: <Kind extends FunctionKind, Args, Success, Failure
 declare function createApi<Modules>(): Api<Modules>;
 //#endregion
 export { functionPathOf as a, createApi as i, FunctionReference as n, MutationInput as r, Api as t };
-//# sourceMappingURL=api-jCl8Hzry.d.ts.map
+//# sourceMappingURL=api-5XSrIeqW.d.ts.map

package/dist/runtime/client.d.ts

@@ -1,8 +1,9 @@
-import { a as InternalServerError, g as FileValue, h as FileMimeType, i as ErrorValue, l as SettledResult, m as FileMetadata, o as Match, p as FileFormat, s as QueryResult$1 } from "./id-Cs82tq9Q-Caqfx54f.js";
-import "./sync-bMQq9tXx.js";
-import { n as FunctionReference } from "./api-jCl8Hzry.js";
-import { n as PaginationPage, t as PaginationOptions } from "./pagination-Bt3l7QaC-D_zI5zsu.js";
-import "./pagination-DcIkTOFs.js";
+import { a as InternalServerError, g as FileValue, h as FileMimeType, i as ErrorValue, l as SettledResult, m as FileMetadata, o as Match, p as FileFormat, s as QueryResult$1 } from "./id-Cs82tq9Q-CK-maMgN.js";
+import "./result-DIjKM-p4.js";
+import "./sync-avN7NkcU.js";
+import { n as FunctionReference } from "./api-5XSrIeqW.js";
+import { n as PaginationPage, t as PaginationOptions } from "./pagination-D-R9NR61-CpIoHFoI.js";
+import "./pagination-CX5IPbEi.js";
 import { Context as Context$1, Effect, Layer } from "effect";
 import { Dispatch, Reducer, StateUpdater, useCallback, useContext, useDebugValue, useEffect, useErrorBoundary, useId, useImperativeHandle, useLayoutEffect, useMemo, useReducer, useRef, useState } from "preact/hooks";
 import { AnyComponent, Attributes, ClassAttributes, Component, ComponentChild, ComponentChildren, ComponentClass, ComponentConstructor, ComponentFactory, ComponentProps, ComponentType, ComponentType as ComponentType$1, Consumer, Context, ContextType, ErrorInfo, Fragment, FunctionComponent, FunctionalComponent, JSX, Key, PreactConsumer, PreactContext, PreactDOMAttributes, PreactProvider, Provider, Ref, RefCallback, RefObject, RenderableProps, TargetedAnimationEvent, TargetedClipboardEvent, TargetedCommandEvent, TargetedCompositionEvent, TargetedDragEvent, TargetedEvent, TargetedFocusEvent, TargetedInputEvent, TargetedKeyboardEvent, TargetedMouseEvent, TargetedPictureInPictureEvent, TargetedPointerEvent, TargetedSnapEvent, TargetedSubmitEvent, TargetedToggleEvent, TargetedTouchEvent, TargetedTransitionEvent, TargetedUIEvent, TargetedWheelEvent, VNode, cloneElement, createContext, createElement, createRef, h, isValidElement, toChildArray } from "preact";

package/dist/runtime/client.js

@@ -1,5 +1,5 @@
 import { C as RuntimeRequestNonce, T as TableId, _ as AppId, a as RuntimeFileMetadata, b as IdAlphabet, c as fileFormats, d as fileLimits, f as fileMimeTypes, h as makeFileValue, l as fileGrantUrlOf, m as isFileValue, o as RuntimeFileOccurrence, p as grantFileValue, r as FileId, u as fileIdOf, v as DeploymentId, w as SubscriptionId, x as InvocationId, y as GeneratedId } from "./file-C1abuMgd.js";
-import { b as decodeTransportValue, c as upgrade, d as Result$1, h as pending, m as inspectResult, o as PaginationPageSize, p as failureFromWire, s as initial, t as ValueDescriptor, x as encodeTransportObject } from "./descriptor-C5VA9qRl-BhD-WQeO.js";
+import { S as encodeTransportObject, c as initial, f as Result$2, g as pending, h as inspectResult, l as upgrade, m as failureFromWire, s as PaginationPageSize, t as ValueDescriptor, x as decodeTransportValue } from "./descriptor-XzDX2JDw-j3O6YHgW.js";
 import { a as ErrorCode, c as ServerMessageJson, d as WireSuccess, f as AppStateRevision, i as DeploymentCloseCode, l as WireFailure, m as InvocationKey, n as functionPathOf, o as FunctionAddress, p as DeploymentGeneration, r as ClientMessageJson, s as Operation, u as WireResult } from "./api-DzcR7spt.js";
 import { Array as Array$1, Cause, Context, Deferred, Duration, Effect, ErrorReporter, Fiber, HashMap, Layer, ManagedRuntime, Predicate, Schedule, Schema, String } from "effect";
 import { customAlphabet } from "nanoid";
@@ -32,9 +32,10 @@ const Files = { url: (file) => {
 } };
 const formatByMime = {};
 for (const format of fileFormats) formatByMime[fileMimeTypes[format]] = format;
+const MutationObject = Schema.ObjectKeyword.check(Schema.makeFilter((value) => Object.prototype.toString.call(value) === "[object Object]", { message: "Mutation objects must contain ordinary fields; built-in collections are unsupported." }));
 const collectNativeFiles = (value, files) => {
 	if (value instanceof File) {
-		files.push(value);
+		files.add(value);
 		return;
 	}
 	if (isFileValue(value) || Predicate.isDate(value)) return;
@@ -43,7 +44,7 @@ const collectNativeFiles = (value, files) => {
 		return;
 	}
 	if (!Predicate.isObject(value)) return;
-	for (const child of Object.values(value)) collectNativeFiles(child, files);
+	for (const child of Object.values(Schema.decodeSync(MutationObject)(value))) collectNativeFiles(child, files);
 };
 const replaceNativeFiles = (value, replacements) => {
 	if (value instanceof File) return replacements.get(value);
@@ -54,18 +55,23 @@ const replaceNativeFiles = (value, replacements) => {
 };
 const prepareMutationArguments = Effect.fn("SyncClient.prepareMutationArguments")(function* (input) {
 	const ids = yield* IdGenerator;
-	const native = [];
-	collectNativeFiles(input, native);
-	const unique = new Set(native);
-	if (unique.size > fileLimits.filesPerMutation) throw new Error(`A mutation may upload at most ${fileLimits.filesPerMutation} files.`);
-	if ([...unique].reduce((total, file) => total + file.size, 0) > fileLimits.mutationBytes) throw new Error(`Mutation uploads may total at most ${fileLimits.mutationBytes} bytes.`);
+	const unique = yield* Effect.try(() => {
+		const files = /* @__PURE__ */ new Set();
+		collectNativeFiles(input, files);
+		if (files.size > fileLimits.filesPerMutation) throw new Error(`A mutation may upload at most ${fileLimits.filesPerMutation} files.`);
+		if ([...files].reduce((total, file) => total + file.size, 0) > fileLimits.mutationBytes) throw new Error(`Mutation uploads may total at most ${fileLimits.mutationBytes} bytes.`);
+		return files;
+	});
 	const replacements = /* @__PURE__ */ new Map();
 	const nativeFiles = /* @__PURE__ */ new Map();
 	for (const file of unique) {
-		const format = formatByMime[file.type.toLowerCase()];
-		if (format === void 0) throw new Error(`File '${file.name}' has unsupported media type '${file.type || "unknown"}'.`);
-		if (file.size === 0 || file.size > fileLimits.fileBytes) throw new Error(`File '${file.name}' must be between 1 and ${fileLimits.fileBytes} bytes.`);
-		if (new TextEncoder().encode(file.name).byteLength > fileLimits.filenameBytes) throw new Error(`File '${file.name}' has a filename that is too long.`);
+		const format = yield* Effect.try(() => {
+			const format = formatByMime[file.type.toLowerCase()];
+			if (format === void 0) throw new Error(`File '${file.name}' has unsupported media type '${file.type || "unknown"}'.`);
+			if (file.size === 0 || file.size > fileLimits.fileBytes) throw new Error(`File '${file.name}' must be between 1 and ${fileLimits.fileBytes} bytes.`);
+			if (new TextEncoder().encode(file.name).byteLength > fileLimits.filenameBytes) throw new Error(`File '${file.name}' has a filename that is too long.`);
+			return format;
+		});
 		const id = yield* ids.generate(FileId);
 		replacements.set(file, makeFileValue(id, {
 			format,
@@ -75,12 +81,13 @@ const prepareMutationArguments = Effect.fn("SyncClient.prepareMutationArguments"
 		nativeFiles.set(id, file);
 	}
 	return {
-		value: replaceNativeFiles(input, replacements),
+		value: unique.size === 0 ? input : yield* Effect.try(() => replaceNativeFiles(input, replacements)),
 		nativeFiles,
 		fileIds: Array.from(nativeFiles.keys())
 	};
 });
 const applyFileGrants = (value, grants) => {
+	if (grants.length === 0) return value;
 	const byId = /* @__PURE__ */ new Map();
 	for (const grant of grants) {
 		if (byId.has(grant.id)) throw new Error("A query file grant ID is duplicated.");
@@ -105,15 +112,12 @@ const applyFileGrants = (value, grants) => {
 };
 //#endregion
 //#region ../contracts/dist/json.js
-const encodeScalar = (value) => Schema.decodeSync(Schema.String)(JSON.stringify(value));
-const encodeCanonicalJson = (value) => {
-	if (value === null || Predicate.isString(value) || Predicate.isNumber(value) || Predicate.isBoolean(value)) return encodeScalar(value);
-	if (Predicate.isObject(value)) return `{${Array$1.map(Array$1.sort(String.Order)(Object.keys(value)), (key) => {
-		const field = Schema.decodeUnknownSync(Schema.Json)(value[key]);
-		return `${encodeScalar(key)}:${encodeCanonicalJson(field)}`;
-	}).join(",")}}`;
-	return `[${Schema.decodeUnknownSync(Schema.Array(Schema.Json))(value).map(encodeCanonicalJson).join(",")}]`;
+const encodeJson = (value) => {
+	if (Array$1.isArray(value)) return `[${value.map(encodeJson).join(",")}]`;
+	if (value === null || Predicate.isString(value) || Predicate.isNumber(value) || Predicate.isBoolean(value)) return JSON.stringify(value);
+	return `{${Array$1.sortWith(Object.entries(value), ([key]) => key, String.Order).map(([key, field]) => `${JSON.stringify(key)}:${encodeJson(field)}`).join(",")}}`;
 };
+const encodeCanonicalJson = (value) => encodeJson(Schema.decodeSync(Schema.Json)(value));
 //#endregion
 //#region src/client/errors.ts
 /** @effect-diagnostics globalConsole:skip-file */
@@ -342,6 +346,7 @@ const ArtifactKind = Schema.Literals([
 	"ClientShell",
 	"FunctionBundle",
 	"ServerManifest",
+	"ServerEnvironment",
 	"SourceMap",
 	"SchemaSnapshot"
 ]);
@@ -366,7 +371,14 @@ const DeploymentInventoryV1 = Schema.Struct({
 	formatVersion: Schema.Literal(1),
 	files: Schema.Array(ArtifactFile)
 });
-initial(DeploymentInventoryV1);
+const DeploymentInventoryV2 = Schema.Struct({
+	formatVersion: Schema.Literal(2),
+	files: Schema.Array(ArtifactFile)
+});
+upgrade(initial(DeploymentInventoryV1), DeploymentInventoryV2, (inventory) => ({
+	formatVersion: 2,
+	files: inventory.files
+}));
 const ClientManifestV1 = Schema.Struct({
 	formatVersion: Schema.Literal(1),
 	shell: ArtifactReference,
@@ -387,6 +399,16 @@ const SchemaSnapshotField = Schema.Struct({
 	name: Schema.String,
 	value: ValueDescriptor
 });
+const EnvironmentArtifactV1 = Schema.Struct({
+	formatVersion: Schema.Literal(1),
+	nonce: Schema.String.check(Schema.isPattern(/^[A-Za-z0-9_-]{43}$/)),
+	values: Schema.Record(Schema.String, Schema.String)
+});
+initial(EnvironmentArtifactV1);
+const ServerEnvironmentArtifact = Schema.Struct({
+	artifact: ArtifactReference,
+	fields: Schema.Array(SchemaSnapshotField)
+});
 const SchemaSnapshotIndex = Schema.Struct({
 	name: Schema.String,
 	fields: Schema.Array(Schema.String)
@@ -440,11 +462,22 @@ const ServerBuildManifestV2 = Schema.Struct({
 	schema: ArtifactReference,
 	functions: Schema.Array(ServerFunctionArtifact)
 });
-upgrade(initial(ServerBuildManifestV1), ServerBuildManifestV2, (manifest) => ({
+const ServerBuildManifestThroughV2 = upgrade(initial(ServerBuildManifestV1), ServerBuildManifestV2, (manifest) => ({
 	formatVersion: 2,
 	schema: manifest.schema,
 	functions: manifest.functions
 }));
+const ServerBuildManifestV3 = Schema.Struct({
+	formatVersion: Schema.Literal(3),
+	schema: ArtifactReference,
+	environment: Schema.optional(ServerEnvironmentArtifact),
+	functions: Schema.Array(ServerFunctionArtifact)
+});
+upgrade(ServerBuildManifestThroughV2, ServerBuildManifestV3, (manifest) => ({
+	formatVersion: 3,
+	schema: manifest.schema,
+	functions: manifest.functions
+}));
 ArtifactPath.make("inventory.json");
 ArtifactPath.make("client/manifest.json");
 ArtifactPath.make("client/shell.html");
@@ -452,6 +485,7 @@ ArtifactPath.make("client/shell.html");
 `${ArtifactPath.make("client/routes")}`;
 ArtifactPath.make("server/manifest.json");
 ArtifactPath.make("server/schema.json");
+ArtifactPath.make("server/environment.json");
 //#endregion
 //#region ../contracts/dist/runtime/transport.js
 const runtimeInvocationPath = "/v1/invoke";
@@ -519,13 +553,10 @@ const subscribeMessage = (entry) => ({
 });
 const makeQueryCache = (allocateId, sendLifecycleMessage) => {
 	const queries = /* @__PURE__ */ new Map();
-	const queryKeysById = /* @__PURE__ */ new Map();
+	const queriesById = /* @__PURE__ */ new Map();
 	return {
 		entries: () => queries.values(),
-		getById: (id) => {
-			const key = queryKeysById.get(id);
-			return key === void 0 ? void 0 : queries.get(key);
-		},
+		getById: (id) => queriesById.get(id),
 		observe: Effect.fn("SyncClient.QueryCache.observe")(function* (functionAddress, args) {
 			const key = queryKey(functionAddress, args);
 			let entry = queries.get(key);
@@ -541,7 +572,7 @@ const makeQueryCache = (allocateId, sendLifecycleMessage) => {
 					subscriptionId: yield* allocateId
 				};
 				queries.set(key, created);
-				queryKeysById.set(created.subscriptionId, key);
+				queriesById.set(created.subscriptionId, created);
 				yield* sendLifecycleMessage(subscribeMessage(created));
 				entry = created;
 			}
@@ -564,7 +595,7 @@ const makeQueryCache = (allocateId, sendLifecycleMessage) => {
 					yield* Effect.sleep("25 millis");
 					if (observed.references !== 0 || observed.generation !== generation || queries.get(key) !== observed) return;
 					queries.delete(key);
-					queryKeysById.delete(observed.subscriptionId);
+					queriesById.delete(observed.subscriptionId);
 					yield* sendLifecycleMessage({
 						type: "Unsubscribe",
 						id: observed.subscriptionId
@@ -572,25 +603,25 @@ const makeQueryCache = (allocateId, sendLifecycleMessage) => {
 				})
 			};
 		}),
-		setError: (id, error) => {
-			const key = queryKeysById.get(id);
-			const entry = key === void 0 ? void 0 : queries.get(key);
-			if (entry === void 0) return;
-			entry.result = error;
-			for (const listener of entry.listeners) listener();
-		},
 		setResult: (id, result, revision) => {
-			const key = queryKeysById.get(id);
-			const entry = key === void 0 ? void 0 : queries.get(key);
+			const entry = queriesById.get(id);
 			if (entry === void 0) return;
-			if (entry.revision !== void 0 && revision < entry.revision) return;
-			entry.revision = revision;
+			if (revision !== void 0) {
+				if (entry.revision !== void 0 && revision < entry.revision) return;
+				entry.revision = revision;
+			}
 			entry.result = result;
 			for (const listener of entry.listeners) listener();
 		}
 	};
 };
-const resultFromWire = Effect.fn("SyncClient.resultFromWire")((wire, files = []) => Effect.succeed(wire.type === "Success" ? Result$1.succeed(wire.value === void 0 ? void 0 : applyFileGrants(decodeTransportValue(wire.value, wire.dates ?? []), files)) : failureFromWire(wire.error, wire.dates)));
+const resultFromWire = Effect.fn("SyncClient.resultFromWire")((wire, files = []) => Effect.try({
+	try: () => wire.type === "Success" ? Result$2.succeed(wire.value === void 0 ? void 0 : applyFileGrants(decodeTransportValue(wire.value, wire.dates ?? []), files)) : failureFromWire(wire.error, wire.dates),
+	catch: (cause) => InvalidServerMessage.make({
+		cause,
+		message: "The server returned an invalid function result."
+	})
+}));
 const shouldReloadForCloseCode = (code) => code === DeploymentCloseCode;
 const handshakesMatch = (first, next) => first.appId === next.appId && first.deploymentId === next.deploymentId && first.generation === next.generation;
 const handshakeDecision = (remembered, acceptedOnConnection, next) => {
@@ -638,10 +669,16 @@ var SyncClient = class SyncClient extends Context.Service()("ignotum/client/sync
 		};
 		const handleMessage = Effect.fn("SyncClient.handleMessage")(function* (message) {
 			switch (message.type) {
-				case "Snapshot":
-					if (queryCache.getById(message.id) === void 0) return;
-					yield* resultFromWire(message.result, message.files ?? []).pipe(Effect.tap((result) => Effect.sync(() => queryCache.setResult(message.id, result, message.revision))));
+				case "Snapshot": {
+					const entry = queryCache.getById(message.id);
+					if (entry === void 0) return;
+					if (entry.revision !== void 0 && message.revision < entry.revision) return;
+					yield* resultFromWire(message.result, message.files ?? []).pipe(Effect.tap((result) => Effect.sync(() => queryCache.setResult(message.id, result, message.revision))), Effect.catchTags({ InvalidServerMessage: (error) => {
+						queryCache.setResult(message.id, error, message.revision);
+						return reportClientError(error);
+					} }));
 					return;
+				}
 				case "Preparation": {
 					const pendingInvocation = HashMap.getUnsafe(invocations, message.id);
 					if (pendingInvocation !== void 0) yield* Deferred.succeed(pendingInvocation.prepared, message.uploads);
@@ -650,8 +687,10 @@ var SyncClient = class SyncClient extends Context.Service()("ignotum/client/sync
 				case "Result": {
 					const pendingInvocation = HashMap.getUnsafe(invocations, message.id);
 					if (pendingInvocation === void 0) return;
-					invocations = HashMap.remove(invocations, message.id);
-					yield* resultFromWire(message.result).pipe(Effect.flatMap((result) => Deferred.succeed(pendingInvocation.deferred, result)));
+					yield* resultFromWire(message.result).pipe(Effect.flatMap((result) => {
+						invocations = HashMap.remove(invocations, message.id);
+						return Deferred.succeed(pendingInvocation.deferred, result);
+					}), Effect.catchTags({ InvalidServerMessage: (error) => rejectInvocation(message.id, error) }));
 					return;
 				}
 				case "Error": {
@@ -665,7 +704,7 @@ var SyncClient = class SyncClient extends Context.Service()("ignotum/client/sync
 					});
 					if (message.operation?.type === "Invocation") yield* rejectInvocation(message.operation.id, error);
 					else if (message.operation?.type === "Subscription") {
-						queryCache.setError(message.operation.id, error);
+						queryCache.setResult(message.operation.id, error);
 						yield* reportClientError(error);
 					} else yield* reportClientError(error);
 					return;
@@ -781,6 +820,7 @@ var SyncClient = class SyncClient extends Context.Service()("ignotum/client/sync
 					const uploads = yield* Deferred.await(prepared);
 					const expected = new Set(message.files);
 					const received = /* @__PURE__ */ new Set();
+					const transfers = [];
 					for (const upload of uploads) {
 						if (!expected.has(upload.id) || received.has(upload.id)) return yield* InvalidServerMessage.make({
 							cause: /* @__PURE__ */ new Error(`Unexpected prepared file '${upload.id}'.`),
@@ -793,12 +833,22 @@ var SyncClient = class SyncClient extends Context.Service()("ignotum/client/sync
 							message: "The server prepared an unknown application file."
 						});
 						if (upload.url === void 0) continue;
-						const uploadUrl = upload.url;
+						transfers.push({
+							file,
+							url: upload.url
+						});
+					}
+					if (received.size !== expected.size) return yield* InvalidServerMessage.make({
+						cause: /* @__PURE__ */ new Error("The server omitted a prepared file."),
+						message: "The server returned incomplete application file preparation data."
+					});
+					yield* Effect.forEach(transfers, Effect.fn("SyncClient.uploadFile")(function* ({ file, url }) {
 						const response = yield* Effect.tryPromise({
-							try: () => fetch(uploadUrl, {
+							try: (signal) => fetch(url, {
 								method: "PUT",
 								body: file,
-								headers: { "content-type": file.type }
+								headers: { "content-type": file.type },
+								signal
 							}),
 							catch: (cause) => ConnectionUnavailable.make({
 								cause,
@@ -813,10 +863,9 @@ var SyncClient = class SyncClient extends Context.Service()("ignotum/client/sync
 								message: `File '${file.name}' was rejected by application storage.`
 							});
 						}
-					}
-					if (received.size !== expected.size) return yield* InvalidServerMessage.make({
-						cause: /* @__PURE__ */ new Error("The server omitted a prepared file."),
-						message: "The server returned incomplete application file preparation data."
+					}), {
+						concurrency: 3,
+						discard: true
 					});
 					const pendingInvocation = HashMap.getUnsafe(invocations, invocationId);
 					if (pendingInvocation === void 0) return yield* Deferred.await(deferred);
@@ -844,6 +893,56 @@ const syncRuntime = ManagedRuntime.make(SyncClient.layer.pipe(Layer.provideMerge
 const hot = import.meta.hot;
 if (hot !== void 0) hot.dispose(() => void syncRuntime.dispose());
 //#endregion
+//#region src/client/page-observers.ts
+const makePageObservers = (onChange, releaseObserver) => {
+	const pages = /* @__PURE__ */ new Map();
+	let disposed = false;
+	const releaseEntry = (entry) => {
+		entry.released = true;
+		entry.release?.();
+	};
+	return {
+		observe: Effect.fn("PageObservers.observe")(function* (functionAddress, args) {
+			if (disposed) return;
+			const key = syncClientInternals.queryIdentity(functionAddress, args);
+			const existing = pages.get(key);
+			if (existing !== void 0) return yield* existing.acquire;
+			const entry = {
+				acquire: yield* Effect.cached(Effect.gen(function* () {
+					const observer = yield* (yield* SyncClient).observe(functionAddress, args);
+					if (entry.released) {
+						releaseObserver(observer.release);
+						return;
+					}
+					const unsubscribe = observer.subscribe(onChange);
+					entry.release = () => {
+						unsubscribe();
+						releaseObserver(observer.release);
+					};
+					return observer;
+				})),
+				release: void 0,
+				released: false
+			};
+			pages.set(key, entry);
+			return yield* entry.acquire;
+		}),
+		retain: (keys) => {
+			for (const [key, entry] of pages) {
+				if (keys.has(key)) continue;
+				pages.delete(key);
+				releaseEntry(entry);
+			}
+		},
+		release: () => {
+			if (disposed) return;
+			disposed = true;
+			for (const entry of pages.values()) releaseEntry(entry);
+			pages.clear();
+		}
+	};
+};
+//#endregion
 //#region src/client/hooks.ts
 function useQuery(reference, args) {
 	const functionPath = functionPathOf(reference);
@@ -916,6 +1015,10 @@ function usePaginatedQuery(reference, args, options = {}) {
 		result: pending()
 	}));
 	const loadMore = useCallback$1(() => setRequestedPages((count) => count + 1), []);
+	const pages = useMemo$1(() => makePageObservers(() => setRefresh((version) => version + 1), (release) => {
+		syncRuntime.runFork(release);
+	}), [identity, pageSize]);
+	useEffect$1(() => () => pages.release(), [pages]);
 	useDebugValue$1({
 		args: input,
 		function: functionPath,
@@ -931,9 +1034,8 @@ function usePaginatedQuery(reference, args, options = {}) {
 	useEffect$1(() => {
 		if (skipped) return;
 		let active = true;
-		const releases = [];
+		const usedPages = /* @__PURE__ */ new Set();
 		syncRuntime.runPromise(Effect.gen(function* () {
-			const client = yield* SyncClient;
 			const items = [];
 			let cursor = null;
 			for (let pageNumber = 0; pageNumber < requestedPages; pageNumber += 1) {
@@ -944,18 +1046,9 @@ function usePaginatedQuery(reference, args, options = {}) {
 						pageSize
 					}
 				});
-				const observer = yield* client.observe(functionPath, pageArgs);
-				if (!active) {
-					yield* observer.release;
-					return;
-				}
-				const releaseSubscription = observer.subscribe(() => {
-					if (active) setRefresh((version) => version + 1);
-				});
-				releases.push(() => {
-					releaseSubscription();
-					syncRuntime.runFork(observer.release);
-				});
+				usedPages.add(syncClientInternals.queryIdentity(functionPath, pageArgs));
+				const observer = yield* pages.observe(functionPath, pageArgs);
+				if (!active || observer === void 0) return;
 				const snapshot = observer.getSnapshot();
 				if (Schema.is(ClientInfrastructureError)(snapshot)) {
 					setState({
@@ -968,7 +1061,7 @@ function usePaginatedQuery(reference, args, options = {}) {
 				if (inspected === void 0) {
 					setState({
 						identity,
-						result: items.length === 0 ? pending() : Result$1.succeed({
+						result: items.length === 0 ? pending() : Result$2.succeed({
 							items,
 							loadMore,
 							status: "LoadingMore"
@@ -989,7 +1082,7 @@ function usePaginatedQuery(reference, args, options = {}) {
 				if (cursor === null) {
 					setState({
 						identity,
-						result: Result$1.succeed({
+						result: Result$2.succeed({
 							items,
 							loadMore,
 							status: "Exhausted"
@@ -1000,13 +1093,15 @@ function usePaginatedQuery(reference, args, options = {}) {
 			}
 			setState({
 				identity,
-				result: Result$1.succeed({
+				result: Result$2.succeed({
 					items,
 					loadMore,
 					status: "CanLoadMore"
 				})
 			});
-		})).catch((error) => {
+		}).pipe(Effect.ensuring(Effect.sync(() => {
+			if (active) pages.retain(usedPages);
+		})))).catch((error) => {
 			if (active && Schema.is(ClientInfrastructureError)(error)) setState({
 				identity,
 				result: error
@@ -1014,13 +1109,13 @@ function usePaginatedQuery(reference, args, options = {}) {
 		});
 		return () => {
 			active = false;
-			for (const release of releases) release();
 		};
 	}, [
 		functionPath,
 		identity,
 		loadMore,
 		pageSize,
+		pages,
 		refresh,
 		requestedPages,
 		skipped
@@ -1048,7 +1143,7 @@ const app = (definition) => {
 };
 //#endregion
 //#region src/client/index.ts
-const Result = { match: Result$1.match };
+const Result = { match: Result$2.match };
 //#endregion
 export { Component, Files, Fragment, Query, Result, app, cloneElement, createContext, createElement, createRef, h, isValidElement, toChildArray, useCallback, useContext, useDebugValue, useEffect, useErrorBoundary, useId, useImperativeHandle, useLayoutEffect, useMemo, useMutation, usePaginatedQuery, useQuery, useReducer, useRef, useState };