@mearie/solid 0.3.4 → 0.4.0

package/dist/index.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 let _mearie_core = require("@mearie/core");
 let solid_js = require("solid-js");
+let solid_js_store = require("solid-js/store");
 let _mearie_core_stream = require("@mearie/core/stream");
 
 //#region src/client-provider.tsx
@@ -19,16 +20,19 @@ const useClient = () => {
 const createQuery = ((query, variables, options) => {
 	const client = useClient();
 	const initialOpts = options?.();
-	const [data, setData] = (0, solid_js.createSignal)(initialOpts?.initialData);
+	const [data, setData] = (0, solid_js_store.createStore)({ value: initialOpts?.initialData });
 	const [loading, setLoading] = (0, solid_js.createSignal)(!initialOpts?.skip && !initialOpts?.initialData);
 	const [error, setError] = (0, solid_js.createSignal)();
 	const [metadata, setMetadata] = (0, solid_js.createSignal)();
 	let unsubscribe = null;
 	let initialized = false;
-	const execute = () => {
+	const execute = (force = false) => {
 		unsubscribe?.();
-		if (options?.()?.skip) return;
-		if (!initialized && initialOpts?.initialData) setLoading(true);
+		if (!force && options?.()?.skip) {
+			setLoading(false);
+			return;
+		}
+		if (initialized || !initialOpts?.initialData) setLoading(true);
 		initialized = true;
 		setError(void 0);
 		unsubscribe = (0, _mearie_core_stream.pipe)(client.executeQuery(query, typeof variables === "function" ? variables() : variables, options?.()), (0, _mearie_core_stream.subscribe)({ next: (result) => {
@@ -37,14 +41,19 @@ const createQuery = ((query, variables, options) => {
 				setError(new _mearie_core.AggregatedError(result.errors));
 				setLoading(false);
 			} else {
-				setData(() => result.data);
+				const patches = result.metadata?.cache?.patches;
+				if (patches) setData("value", (0, solid_js_store.produce)((draft) => {
+					const root = (0, _mearie_core.applyPatchesMutable)(draft, patches);
+					if (root !== void 0) return root;
+				}));
+				else setData("value", (0, solid_js_store.reconcile)(result.data));
 				setLoading(false);
 				setError(void 0);
 			}
 		} }));
 	};
 	const refetch = () => {
-		(0, solid_js.untrack)(execute);
+		(0, solid_js.untrack)(() => execute(true));
 	};
 	(0, solid_js.createEffect)(() => {
 		execute();
@@ -54,7 +63,7 @@ const createQuery = ((query, variables, options) => {
 	});
 	return {
 		get data() {
-			return data();
+			return data.value;
 		},
 		get loading() {
 			return loading();
@@ -176,18 +185,23 @@ const createFragment = ((fragment, fragmentRef, options) => {
 		initialData = result.data;
 		initialMetadata = result.metadata;
 	}
-	const [data, setData] = (0, solid_js.createSignal)(initialData);
+	const [data, setData] = (0, solid_js_store.createStore)({ value: initialData });
 	const [metadata, setMetadata] = (0, solid_js.createSignal)(initialMetadata);
 	(0, solid_js.createEffect)(() => {
 		const currentRef = fragmentRef();
 		if (currentRef == null) {
-			setData(() => null);
+			setData("value", (0, solid_js_store.reconcile)(null));
 			setMetadata(void 0);
 			return;
 		}
 		const unsubscribe = (0, _mearie_core_stream.pipe)(client.executeFragment(fragment, currentRef, options?.()), (0, _mearie_core_stream.subscribe)({ next: (result) => {
 			setMetadata(result.metadata);
-			if (result.data !== void 0) setData(() => result.data);
+			const patches = result.metadata?.cache?.patches;
+			if (patches) setData("value", (0, solid_js_store.produce)((draft) => {
+				const root = (0, _mearie_core.applyPatchesMutable)(draft, patches);
+				if (root !== void 0) return root;
+			}));
+			else if (result.data !== void 0) setData("value", (0, solid_js_store.reconcile)(result.data));
 		} }));
 		(0, solid_js.onCleanup)(() => {
 			unsubscribe();
@@ -195,7 +209,7 @@ const createFragment = ((fragment, fragmentRef, options) => {
 	});
 	return {
 		get data() {
-			return data();
+			return data.value;
 		},
 		get metadata() {
 			return metadata();

package/dist/index.mjs

@@ -1,5 +1,6 @@
-import { AggregatedError } from "@mearie/core";
+import { AggregatedError, applyPatchesMutable } from "@mearie/core";
 import { createContext, createEffect, createSignal, onCleanup, untrack, useContext } from "solid-js";
+import { createStore, produce, reconcile } from "solid-js/store";
 import { collect, peek, pipe, subscribe, take } from "@mearie/core/stream";
 
 export * from "@mearie/core"
@@ -20,16 +21,19 @@ const useClient = () => {
 const createQuery = ((query, variables, options) => {
 	const client = useClient();
 	const initialOpts = options?.();
-	const [data, setData] = createSignal(initialOpts?.initialData);
+	const [data, setData] = createStore({ value: initialOpts?.initialData });
 	const [loading, setLoading] = createSignal(!initialOpts?.skip && !initialOpts?.initialData);
 	const [error, setError] = createSignal();
 	const [metadata, setMetadata] = createSignal();
 	let unsubscribe = null;
 	let initialized = false;
-	const execute = () => {
+	const execute = (force = false) => {
 		unsubscribe?.();
-		if (options?.()?.skip) return;
-		if (!initialized && initialOpts?.initialData) setLoading(true);
+		if (!force && options?.()?.skip) {
+			setLoading(false);
+			return;
+		}
+		if (initialized || !initialOpts?.initialData) setLoading(true);
 		initialized = true;
 		setError(void 0);
 		unsubscribe = pipe(client.executeQuery(query, typeof variables === "function" ? variables() : variables, options?.()), subscribe({ next: (result) => {
@@ -38,14 +42,19 @@ const createQuery = ((query, variables, options) => {
 				setError(new AggregatedError(result.errors));
 				setLoading(false);
 			} else {
-				setData(() => result.data);
+				const patches = result.metadata?.cache?.patches;
+				if (patches) setData("value", produce((draft) => {
+					const root = applyPatchesMutable(draft, patches);
+					if (root !== void 0) return root;
+				}));
+				else setData("value", reconcile(result.data));
 				setLoading(false);
 				setError(void 0);
 			}
 		} }));
 	};
 	const refetch = () => {
-		untrack(execute);
+		untrack(() => execute(true));
 	};
 	createEffect(() => {
 		execute();
@@ -55,7 +64,7 @@ const createQuery = ((query, variables, options) => {
 	});
 	return {
 		get data() {
-			return data();
+			return data.value;
 		},
 		get loading() {
 			return loading();
@@ -177,18 +186,23 @@ const createFragment = ((fragment, fragmentRef, options) => {
 		initialData = result.data;
 		initialMetadata = result.metadata;
 	}
-	const [data, setData] = createSignal(initialData);
+	const [data, setData] = createStore({ value: initialData });
 	const [metadata, setMetadata] = createSignal(initialMetadata);
 	createEffect(() => {
 		const currentRef = fragmentRef();
 		if (currentRef == null) {
-			setData(() => null);
+			setData("value", reconcile(null));
 			setMetadata(void 0);
 			return;
 		}
 		const unsubscribe = pipe(client.executeFragment(fragment, currentRef, options?.()), subscribe({ next: (result) => {
 			setMetadata(result.metadata);
-			if (result.data !== void 0) setData(() => result.data);
+			const patches = result.metadata?.cache?.patches;
+			if (patches) setData("value", produce((draft) => {
+				const root = applyPatchesMutable(draft, patches);
+				if (root !== void 0) return root;
+			}));
+			else if (result.data !== void 0) setData("value", reconcile(result.data));
 		} }));
 		onCleanup(() => {
 			unsubscribe();
@@ -196,7 +210,7 @@ const createFragment = ((fragment, fragmentRef, options) => {
 	});
 	return {
 		get data() {
-			return data();
+			return data.value;
 		},
 		get metadata() {
 			return metadata();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearie/solid",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "Type-safe, zero-overhead GraphQL client",
   "keywords": [
     "graphql",
@@ -52,12 +52,14 @@
     "README.md"
   ],
   "dependencies": {
-    "@mearie/core": "0.5.2"
+    "@mearie/core": "0.6.0"
   },
   "devDependencies": {
+    "happy-dom": "^20.8.3",
     "solid-js": "^1.9.11",
     "tsdown": "^0.20.3",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vite-plugin-solid": "^2.11.10"
   },
   "peerDependencies": {
     "solid-js": "^1.8.0"