@unisian/start 0.1.0 → 0.2.0

package/dist/client.d.mts

@@ -5,11 +5,12 @@ import { AppRouterOptions, createAppRouter } from "./router.mjs";
 import * as Schema from "effect/Schema";
 import * as Option from "effect/Option";
 import { AnyContract, FailureOf, InputOf, OutputOf } from "@unisian/capability";
-import { QueryClient, QueryKey, UseSuspenseQueryOptions } from "@tanstack/react-query";
+import { InfiniteData, QueryClient, QueryKey, UseSuspenseQueryOptions } from "@tanstack/react-query";
 //#region src/client.d.ts
 export type ServerFn<ContractType extends AnyContract> = (options: {
   readonly data: InputOf<ContractType>["Encoded"];
   readonly headers?: Record<string, string>;
+  readonly signal?: AbortSignal;
 }) => Promise<Schema.Json>;
 export interface PerCall {
   readonly headers?: Record<string, string> | undefined;
@@ -18,6 +19,12 @@ export interface PerCall {
 export declare const query: <ContractType extends AnyContract>(contract: ContractType, serverFn: ServerFn<ContractType>) => (input: InputOf<ContractType>["Type"], perCall?: PerCall) => import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseQueryOptions<Schema.Json, CapabilityFailureError<FailureOf<ContractType>["Type"]>, OutputOf<ContractType>["Type"], readonly [ContractType["name"], InputOf<ContractType>["Encoded"], ...Schema.Json[]]>, "queryFn"> & {
   queryFn?: import("@tanstack/react-query").QueryFunction<Schema.Json, readonly [ContractType["name"], InputOf<ContractType>["Encoded"], ...Schema.Json[]], never>;
 } & import("@tanstack/react-query").QueryKeyWithDataTag<readonly [ContractType["name"], InputOf<ContractType>["Encoded"], ...Schema.Json[]], Schema.Json, CapabilityFailureError<FailureOf<ContractType>["Type"]>>;
+export interface InfiniteQueryOptions<ContractType extends AnyContract> {
+  readonly getNextPageParam: (lastPage: OutputOf<ContractType>["Type"], lastInput: InputOf<ContractType>["Type"]) => InputOf<ContractType>["Type"] | undefined;
+}
+export declare const infiniteQuery: <ContractType extends AnyContract>(contract: ContractType, serverFn: ServerFn<ContractType>, { getNextPageParam }: InfiniteQueryOptions<ContractType>) => (input: InputOf<ContractType>["Type"], perCall?: PerCall) => import("@tanstack/react-query").OmitKeyof<import("@tanstack/react-query").UseInfiniteQueryOptions<Schema.Json, CapabilityFailureError<FailureOf<ContractType>["Type"]>, InfiniteData<OutputOf<ContractType>["Type"], InputOf<ContractType>["Type"]>, readonly [ContractType["name"], InputOf<ContractType>["Encoded"], ...Schema.Json[]], InputOf<ContractType>["Encoded"]>, "queryFn"> & {
+  queryFn?: import("@tanstack/react-query").QueryFunction<Schema.Json, readonly [ContractType["name"], InputOf<ContractType>["Encoded"], ...Schema.Json[]], InputOf<ContractType>["Encoded"]>;
+} & import("@tanstack/react-query").QueryKeyWithDataTag<readonly [ContractType["name"], InputOf<ContractType>["Encoded"], ...Schema.Json[]], InfiniteData<Schema.Json, unknown>, CapabilityFailureError<FailureOf<ContractType>["Type"]>>;
 export declare const cachedData: <Output>(client: QueryClient, options: {
   readonly queryKey: QueryKey;
   readonly select?: ((encoded: Schema.Json) => Output) | undefined;

package/dist/client.mjs

@@ -5,19 +5,28 @@ import { useCommandForm } from "./command-form.mjs";
 import { createAppRouter } from "./router.mjs";
 import * as Schema from "effect/Schema";
 import * as Option from "effect/Option";
-import { environmentManager, mutationOptions, queryOptions } from "@tanstack/react-query";
+import { environmentManager, infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/react-query";
 //#region src/client.ts
 const transportRetries = 2;
 const keyFor = (head, { key }) => key === void 0 ? head : [...head, key];
+const retry = (failureCount, error) => !(error instanceof CapabilityFailureError) && failureCount < (environmentManager.isServer() ? 0 : transportRetries);
 const callerFor = (contract, serverFn) => {
 	const encodeInput = Schema.encodeSync(contract.input);
+	const decodeInput = Schema.decodeUnknownSync(contract.input);
 	const decodeOutput = Schema.decodeUnknownSync(Schema.toCodecJson(contract.output));
 	const { decode } = wireFor(contract.failure);
 	return {
-		call: (data, { headers }) => serverFn(headers === void 0 ? { data } : {
-			data,
-			headers
-		}).then(decode),
+		call: (data, { headers }, signal) => {
+			const options = headers === void 0 ? { data } : {
+				data,
+				headers
+			};
+			return serverFn(signal === void 0 ? options : {
+				...options,
+				signal
+			}).then(decode);
+		},
+		decodeInput,
 		decodeOutput,
 		encodeInput
 	};
@@ -27,13 +36,39 @@ const query = (contract, serverFn) => {
 	return (input, perCall = {}) => {
 		const data = encodeInput(input);
 		return queryOptions({
-			queryFn: () => call(data, perCall),
+			queryFn: ({ signal }) => call(data, perCall, signal),
 			queryKey: keyFor([contract.name, data], perCall),
-			retry: (failureCount, error) => !(error instanceof CapabilityFailureError) && failureCount < (environmentManager.isServer() ? 0 : transportRetries),
+			retry,
 			select: decodeOutput
 		});
 	};
 };
+const infiniteQuery = (contract, serverFn, { getNextPageParam }) => {
+	const { encodeInput, decodeInput, decodeOutput, call } = callerFor(contract, serverFn);
+	const nextInput = (lastPage, _allPages, lastInput) => {
+		const next = getNextPageParam(decodeOutput(lastPage), decodeInput(lastInput));
+		return next === void 0 ? void 0 : encodeInput(next);
+	};
+	const select = ({ pageParams, pages }) => ({
+		pageParams: pageParams.map((pageParam) => decodeInput(pageParam)),
+		pages: pages.map((page) => decodeOutput(page))
+	});
+	return (input, perCall = {}) => {
+		const data = encodeInput(input);
+		return infiniteQueryOptions({
+			getNextPageParam: nextInput,
+			initialPageParam: data,
+			queryFn: ({ pageParam, signal }) => call(pageParam, perCall, signal),
+			queryKey: keyFor([
+				contract.name,
+				data,
+				"pages"
+			], perCall),
+			retry,
+			select
+		});
+	};
+};
 const cachedData = (client, options) => {
 	const encoded = client.getQueryData(options.queryKey);
 	return encoded === void 0 ? void 0 : options.select?.(encoded);
@@ -60,4 +95,4 @@ const command = (contract, serverFn, options) => {
 	});
 };
 //#endregion
-export { cachedData, cachedQuery, command, createAppRouter, query, reportBrowserErrors, useBrowserErrorReference, useCommandForm };
+export { cachedData, cachedQuery, command, createAppRouter, infiniteQuery, query, reportBrowserErrors, useBrowserErrorReference, useCommandForm };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisian/start",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,13 +29,13 @@
     "@tanstack/react-router": "1.170.41",
     "@tanstack/react-router-ssr-query": "1.167.3",
     "@tanstack/react-start": "1.168.60",
-    "effect": "4.0.2",
+    "effect": "4.0.6",
     "react": "19.3.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
-    "@unisian/capability": "0.1.0",
-    "@unisian/effect-observability": "0.1.0",
-    "@unisian/shopify-auth": "0.1.0",
-    "@unisian/shopify-sessions": "0.1.0"
+    "@unisian/effect-observability": "0.2.0",
+    "@unisian/shopify-auth": "0.2.0",
+    "@unisian/capability": "0.2.0",
+    "@unisian/shopify-sessions": "0.2.0"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.104.1",
@@ -44,10 +44,10 @@
     "@tanstack/react-start": "^1.168.60",
     "effect": "^4.0.2",
     "react": "^19.3.0",
-    "@unisian/effect-observability": "0.1.0",
-    "@unisian/capability": "0.1.0",
-    "@unisian/shopify-auth": "0.1.0",
-    "@unisian/shopify-sessions": "0.1.0"
+    "@unisian/capability": "0.2.0",
+    "@unisian/effect-observability": "0.2.0",
+    "@unisian/shopify-auth": "0.2.0",
+    "@unisian/shopify-sessions": "0.2.0"
   },
   "scripts": {}
 }