@unisian/start 0.4.1 → 0.4.3

package/dist/client.mjs

@@ -81,6 +81,7 @@ const cachedQuery = (client, options) => {
 		staleTime: "static"
 	}).then(Option.some);
 };
+const unobservedAndIdle = (cached) => cached.getObserversCount() === 0 && cached.state.fetchStatus === "idle";
 const command = (contract, serverFn, options) => {
 	const { encodeInput, decodeOutput, call } = callerFor(contract, serverFn);
 	return mutationOptions({
@@ -88,7 +89,13 @@ const command = (contract, serverFn, options) => {
 			try {
 				return decodeOutput(await call(encodeInput(input), options));
 			} finally {
-				await Promise.all(options.invalidates.map(({ name }) => client.invalidateQueries({ queryKey: [name] })));
+				await Promise.all(options.invalidates.map(({ name }) => {
+					client.removeQueries({
+						predicate: unobservedAndIdle,
+						queryKey: [name]
+					});
+					return client.invalidateQueries({ queryKey: [name] });
+				}));
 			}
 		},
 		mutationKey: keyFor([contract.name], options)

package/dist/proxy.mjs

@@ -7,6 +7,7 @@ import { RequestReference, logFailure } from "@unisian/effect-observability";
 import { LoggedInCustomer, ShopifyAdmin, ShopifyStorefront, StorefrontOperationRegistry, appProxyIdentity, shopifyLayer, verifyAppProxy } from "@unisian/shopify-auth";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as SchemaAST from "effect/SchemaAST";
 //#region src/proxy.ts
 const shopifyQueryKeys = /* @__PURE__ */ new Set([
 	"logged_in_customer_id",
@@ -15,18 +16,28 @@ const shopifyQueryKeys = /* @__PURE__ */ new Set([
 	"signature",
 	"timestamp"
 ]);
-const fieldsOf = (entries) => {
-	const fields = /* @__PURE__ */ new Map();
-	for (const [key, value] of entries) if (!shopifyQueryKeys.has(key)) {
-		const earlier = fields.get(key);
-		fields.set(key, earlier === void 0 ? value : [...[earlier].flat(), value]);
+const takesList = (ast) => SchemaAST.isArrays(ast) || SchemaAST.isUnion(ast) && ast.types.some(takesList);
+const listKeysOf = (input) => {
+	const encoded = SchemaAST.toEncoded(input.ast);
+	return new Set(SchemaAST.isObjects(encoded) ? encoded.propertySignatures.filter((field) => takesList(field.type)).map(({ name }) => name) : []);
+};
+const fieldsOf = (entries, listKeys) => {
+	const singles = /* @__PURE__ */ new Map();
+	const lists = /* @__PURE__ */ new Map();
+	for (const [key, value] of entries) {
+		if (shopifyQueryKeys.has(key)) continue;
+		if (listKeys.has(key)) lists.set(key, [...lists.get(key) ?? [], value]);
+		else if (!singles.has(key)) singles.set(key, value);
 	}
-	return Object.fromEntries(fields);
+	return {
+		...Object.fromEntries(singles),
+		...Object.fromEntries(lists)
+	};
 };
 const decodeJsonBody = Schema.decodeUnknownEffect(Schema.Record(Schema.String, Schema.Json));
 const rejected = (cause) => new ProxyInputRejected({ cause });
 const isForm = (type) => type.startsWith("application/x-www-form-urlencoded") || type.startsWith("multipart/form-data");
-const bodyFields = (request) => {
+const bodyFields = (request, listKeys) => {
 	const type = request.headers.get("content-type") ?? "";
 	if (type.startsWith("application/json")) return Effect.tryPromise({
 		catch: rejected,
@@ -35,7 +46,7 @@ const bodyFields = (request) => {
 	if (isForm(type)) return Effect.tryPromise({
 		catch: rejected,
 		try: () => request.formData()
-	}).pipe(Effect.map((form) => fieldsOf(form.entries())));
+	}).pipe(Effect.map((form) => fieldsOf(form.entries(), listKeys)));
 	return Effect.succeed({});
 };
 const buyerIp = (request) => {
@@ -65,6 +76,7 @@ const answerWith = (answer, output, encoded, fields, storefront) => {
 const loggedOutAnswer = (answer, fields, storefront) => answer.answer === "page" || answer.answer === "redirect" && !fetchedSave(answer, fields) ? proxyRedirect(storefront.login()) : proxyError("unauthorized", "Login required");
 const project = (config) => (contract, options, run) => {
 	const decodeInput = Schema.decodeUnknownEffect(contract.input);
+	const listKeys = listKeysOf(contract.input);
 	const encodeOutput = Schema.encodeEffect(Schema.toCodecJson(contract.output));
 	const isFailure = Schema.is(contract.failure);
 	const refuseWith = (storefront) => (failure) => options.refuse === void 0 ? Effect.die(failure) : Effect.succeed(options.refuse(failure, storefront));
@@ -73,9 +85,9 @@ const project = (config) => (contract, options, run) => {
 		const layerFor = (proxy) => Layer.mergeAll(appProxyIdentity(proxy), ShopifyAdmin.layerForShop(proxy.shop), ShopifyStorefront.layerForShop(proxy.shop, buyerIp(request)), Layer.succeed(RequestReference, { reference: log.reference }), services ?? Layer.empty).pipe(Layer.orDie);
 		const served = Effect.gen(function* serveProxy() {
 			const proxy = yield* verifyAppProxy(request);
-			const body = yield* bodyFields(request);
+			const body = yield* bodyFields(request, listKeys);
 			const fields = {
-				...fieldsOf(new URL(request.url).searchParams),
+				...fieldsOf(new URL(request.url).searchParams, listKeys),
 				...body,
 				...params
 			};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisian/start",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -35,10 +35,10 @@
     "react": "19.3.0",
     "react-dom": "19.3.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
-    "@unisian/capability": "0.4.1",
-    "@unisian/effect-observability": "0.4.1",
-    "@unisian/shopify-auth": "0.4.1",
-    "@unisian/shopify-sessions": "0.4.1"
+    "@unisian/capability": "0.4.3",
+    "@unisian/effect-observability": "0.4.3",
+    "@unisian/shopify-auth": "0.4.3",
+    "@unisian/shopify-sessions": "0.4.3"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.104.1",
@@ -48,10 +48,10 @@
     "effect": "^4.0.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
-    "@unisian/capability": "0.4.1",
-    "@unisian/effect-observability": "0.4.1",
-    "@unisian/shopify-auth": "0.4.1",
-    "@unisian/shopify-sessions": "0.4.1"
+    "@unisian/capability": "0.4.3",
+    "@unisian/shopify-auth": "0.4.3",
+    "@unisian/shopify-sessions": "0.4.3",
+    "@unisian/effect-observability": "0.4.3"
   },
   "scripts": {}
 }