@mearie/solid 0.1.1 → 0.2.1

package/dist/index.cjs

@@ -1,32 +1,7 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-let __mearie_core = require("@mearie/core");
-__mearie_core = __toESM(__mearie_core);
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+let _mearie_core = require("@mearie/core");
 let solid_js = require("solid-js");
-solid_js = __toESM(solid_js);
-let __mearie_core_stream = require("@mearie/core/stream");
-__mearie_core_stream = __toESM(__mearie_core_stream);
+let _mearie_core_stream = require("@mearie/core/stream");
 
 //#region src/client-provider.tsx
 const ClientContext = (0, solid_js.createContext)();
@@ -41,20 +16,23 @@ const useClient = () => {
 
 //#endregion
 //#region src/create-query.ts
-const createQuery = (query, ...[variables, options]) => {
+const createQuery = ((query, variables, options) => {
 	const client = useClient();
-	const [data, setData] = (0, solid_js.createSignal)();
-	const [loading, setLoading] = (0, solid_js.createSignal)(!options?.()?.skip);
+	const initialOpts = options?.();
+	const [data, setData] = (0, solid_js.createSignal)(initialOpts?.initialData);
+	const [loading, setLoading] = (0, solid_js.createSignal)(!initialOpts?.skip && !initialOpts?.initialData);
 	const [error, setError] = (0, solid_js.createSignal)();
 	let unsubscribe = null;
+	let initialized = false;
 	const execute = () => {
 		unsubscribe?.();
 		if (options?.()?.skip) return;
-		setLoading(true);
+		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) => {
+		unsubscribe = (0, _mearie_core_stream.pipe)(client.executeQuery(query, typeof variables === "function" ? variables() : variables, options?.()), (0, _mearie_core_stream.subscribe)({ next: (result) => {
 			if (result.errors && result.errors.length > 0) {
-				setError(new __mearie_core.AggregatedError(result.errors));
+				setError(new _mearie_core.AggregatedError(result.errors));
 				setLoading(false);
 			} else {
 				setData(() => result.data);
@@ -84,7 +62,7 @@ const createQuery = (query, ...[variables, options]) => {
 		},
 		refetch
 	};
-};
+});
 
 //#endregion
 //#region src/create-subscription.ts
@@ -97,9 +75,9 @@ const createSubscription = (subscription, ...[variables, options]) => {
 		if (options?.()?.skip) return;
 		setLoading(true);
 		setError(void 0);
-		const unsubscribe = (0, __mearie_core_stream.pipe)(client.executeSubscription(subscription, typeof variables === "function" ? variables() : variables, options?.()), (0, __mearie_core_stream.subscribe)({ next: (result) => {
+		const unsubscribe = (0, _mearie_core_stream.pipe)(client.executeSubscription(subscription, typeof variables === "function" ? variables() : variables, options?.()), (0, _mearie_core_stream.subscribe)({ next: (result) => {
 			if (result.errors && result.errors.length > 0) {
-				const err = new __mearie_core.AggregatedError(result.errors);
+				const err = new _mearie_core.AggregatedError(result.errors);
 				setError(err);
 				setLoading(false);
 				options?.()?.onError?.(err);
@@ -139,9 +117,9 @@ const createMutation = (mutation) => {
 		setLoading(true);
 		setError(void 0);
 		try {
-			const result = await (0, __mearie_core_stream.pipe)(client.executeMutation(mutation, variables, options), __mearie_core_stream.collect);
+			const result = await (0, _mearie_core_stream.pipe)(client.executeMutation(mutation, variables, options), (0, _mearie_core_stream.take)(1), _mearie_core_stream.collect);
 			if (result.errors && result.errors.length > 0) {
-				const err = new __mearie_core.AggregatedError(result.errors);
+				const err = new _mearie_core.AggregatedError(result.errors);
 				setError(err);
 				setLoading(false);
 				throw err;
@@ -150,7 +128,7 @@ const createMutation = (mutation) => {
 			setLoading(false);
 			return result.data;
 		} catch (err) {
-			if (err instanceof __mearie_core.AggregatedError) setError(err);
+			if (err instanceof _mearie_core.AggregatedError) setError(err);
 			setLoading(false);
 			throw err;
 		}
@@ -170,14 +148,25 @@ const createMutation = (mutation) => {
 
 //#endregion
 //#region src/create-fragment.ts
-const createFragment = (fragment, fragmentRef, options) => {
+const createFragment = ((fragment, fragmentRef, options) => {
 	const client = useClient();
-	const result = (0, __mearie_core_stream.pipe)(client.executeFragment(fragment, fragmentRef(), options?.()), __mearie_core_stream.peek);
-	if (result.data === void 0) throw new Error("Fragment data not found");
-	const [data, setData] = (0, solid_js.createSignal)(result.data);
+	const initialRef = fragmentRef();
+	let initialData;
+	if (initialRef == null) initialData = null;
+	else {
+		const result = (0, _mearie_core_stream.pipe)(client.executeFragment(fragment, initialRef, options?.()), _mearie_core_stream.peek);
+		if (result.data === void 0) throw new Error("Fragment data not found");
+		initialData = result.data;
+	}
+	const [data, setData] = (0, solid_js.createSignal)(initialData);
 	(0, solid_js.createEffect)(() => {
-		const unsubscribe = (0, __mearie_core_stream.pipe)(client.executeFragment(fragment, fragmentRef(), options?.()), (0, __mearie_core_stream.subscribe)({ next: (result$1) => {
-			if (result$1.data !== void 0) setData(() => result$1.data);
+		const currentRef = fragmentRef();
+		if (currentRef == null) {
+			setData(() => null);
+			return;
+		}
+		const unsubscribe = (0, _mearie_core_stream.pipe)(client.executeFragment(fragment, currentRef, options?.()), (0, _mearie_core_stream.subscribe)({ next: (result) => {
+			if (result.data !== void 0) setData(() => result.data);
 		} }));
 		(0, solid_js.onCleanup)(() => {
 			unsubscribe();
@@ -186,7 +175,7 @@ const createFragment = (fragment, fragmentRef, options) => {
 	return { get data() {
 		return data();
 	} };
-};
+});
 
 //#endregion
 exports.ClientProvider = ClientProvider;
@@ -195,9 +184,9 @@ exports.createMutation = createMutation;
 exports.createQuery = createQuery;
 exports.createSubscription = createSubscription;
 exports.useClient = useClient;
-Object.keys(__mearie_core).forEach(function (k) {
+Object.keys(_mearie_core).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return __mearie_core[k]; }
+    get: function () { return _mearie_core[k]; }
   });
 });

package/dist/index.d.cts

@@ -11,7 +11,7 @@ declare const ClientProvider: <TMeta extends SchemaMeta = SchemaMeta>(props: Cli
 declare const useClient: <TMeta extends SchemaMeta = SchemaMeta>() => Client<TMeta>;
 //#endregion
 //#region src/create-query.d.ts
-type CreateQueryOptions = QueryOptions & {
+type CreateQueryOptions<T extends Artifact<'query'> = Artifact<'query'>> = QueryOptions<T> & {
   skip?: boolean;
 };
 type Query<T extends Artifact<'query'>> = {
@@ -30,7 +30,29 @@ type Query<T extends Artifact<'query'>> = {
   error: AggregatedError;
   refetch: () => void;
 };
-declare const createQuery: <T extends Artifact<"query">>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, Accessor<CreateQueryOptions>?] : [Accessor<VariablesOf<T>>, Accessor<CreateQueryOptions>?]) => Query<T>;
+type DefinedQuery<T extends Artifact<'query'>> = {
+  data: DataOf<T>;
+  loading: true;
+  error: undefined;
+  refetch: () => void;
+} | {
+  data: DataOf<T>;
+  loading: false;
+  error: undefined;
+  refetch: () => void;
+} | {
+  data: DataOf<T>;
+  loading: false;
+  error: AggregatedError;
+  refetch: () => void;
+};
+type CreateQueryFn = {
+  <T extends Artifact<'query'>>(query: T, variables: Accessor<VariablesOf<T>> | undefined, options: Accessor<CreateQueryOptions<T> & {
+    initialData: DataOf<T>;
+  }>): DefinedQuery<T>;
+  <T extends Artifact<'query'>>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, Accessor<CreateQueryOptions<T>>?] : [Accessor<VariablesOf<T>>, Accessor<CreateQueryOptions<T>>?]): Query<T>;
+};
+declare const createQuery: CreateQueryFn;
 //#endregion
 //#region src/create-subscription.d.ts
 type Subscription<T extends Artifact<'subscription'>> = {
@@ -76,6 +98,17 @@ type CreateFragmentOptions = FragmentOptions;
 type Fragment<T extends Artifact<'fragment'>> = {
   data: DataOf<T>;
 };
-declare const createFragment: <T extends Artifact<"fragment">>(fragment: T, fragmentRef: Accessor<FragmentRefs<T["name"]>>, options?: Accessor<CreateFragmentOptions>) => Fragment<T>;
+type FragmentList<T extends Artifact<'fragment'>> = {
+  data: DataOf<T>[];
+};
+type OptionalFragment<T extends Artifact<'fragment'>> = {
+  data: DataOf<T> | null;
+};
+type CreateFragmentFn = {
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: Accessor<FragmentRefs<T['name']>[]>, options?: Accessor<CreateFragmentOptions>): FragmentList<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: Accessor<FragmentRefs<T['name']>>, options?: Accessor<CreateFragmentOptions>): Fragment<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: Accessor<FragmentRefs<T['name']> | null | undefined>, options?: Accessor<CreateFragmentOptions>): OptionalFragment<T>;
+};
+declare const createFragment: CreateFragmentFn;
 //#endregion
-export { ClientProvider, type ClientProviderProps, type CreateFragmentOptions, type CreateMutationOptions, type CreateQueryOptions, type CreateSubscriptionOptions, type Fragment, type Mutation, type MutationResult, type Query, type Subscription, createFragment, createMutation, createQuery, createSubscription, useClient };
+export { ClientProvider, type ClientProviderProps, type CreateFragmentOptions, type CreateMutationOptions, type CreateQueryOptions, type CreateSubscriptionOptions, type DefinedQuery, type Fragment, type FragmentList, type Mutation, type MutationResult, type OptionalFragment, type Query, type Subscription, createFragment, createMutation, createQuery, createSubscription, useClient };

package/dist/{index.d.ts → index.d.mts}

@@ -11,7 +11,7 @@ declare const ClientProvider: <TMeta extends SchemaMeta = SchemaMeta>(props: Cli
 declare const useClient: <TMeta extends SchemaMeta = SchemaMeta>() => Client<TMeta>;
 //#endregion
 //#region src/create-query.d.ts
-type CreateQueryOptions = QueryOptions & {
+type CreateQueryOptions<T extends Artifact<'query'> = Artifact<'query'>> = QueryOptions<T> & {
   skip?: boolean;
 };
 type Query<T extends Artifact<'query'>> = {
@@ -30,7 +30,29 @@ type Query<T extends Artifact<'query'>> = {
   error: AggregatedError;
   refetch: () => void;
 };
-declare const createQuery: <T extends Artifact<"query">>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, Accessor<CreateQueryOptions>?] : [Accessor<VariablesOf<T>>, Accessor<CreateQueryOptions>?]) => Query<T>;
+type DefinedQuery<T extends Artifact<'query'>> = {
+  data: DataOf<T>;
+  loading: true;
+  error: undefined;
+  refetch: () => void;
+} | {
+  data: DataOf<T>;
+  loading: false;
+  error: undefined;
+  refetch: () => void;
+} | {
+  data: DataOf<T>;
+  loading: false;
+  error: AggregatedError;
+  refetch: () => void;
+};
+type CreateQueryFn = {
+  <T extends Artifact<'query'>>(query: T, variables: Accessor<VariablesOf<T>> | undefined, options: Accessor<CreateQueryOptions<T> & {
+    initialData: DataOf<T>;
+  }>): DefinedQuery<T>;
+  <T extends Artifact<'query'>>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, Accessor<CreateQueryOptions<T>>?] : [Accessor<VariablesOf<T>>, Accessor<CreateQueryOptions<T>>?]): Query<T>;
+};
+declare const createQuery: CreateQueryFn;
 //#endregion
 //#region src/create-subscription.d.ts
 type Subscription<T extends Artifact<'subscription'>> = {
@@ -76,6 +98,17 @@ type CreateFragmentOptions = FragmentOptions;
 type Fragment<T extends Artifact<'fragment'>> = {
   data: DataOf<T>;
 };
-declare const createFragment: <T extends Artifact<"fragment">>(fragment: T, fragmentRef: Accessor<FragmentRefs<T["name"]>>, options?: Accessor<CreateFragmentOptions>) => Fragment<T>;
+type FragmentList<T extends Artifact<'fragment'>> = {
+  data: DataOf<T>[];
+};
+type OptionalFragment<T extends Artifact<'fragment'>> = {
+  data: DataOf<T> | null;
+};
+type CreateFragmentFn = {
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: Accessor<FragmentRefs<T['name']>[]>, options?: Accessor<CreateFragmentOptions>): FragmentList<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: Accessor<FragmentRefs<T['name']>>, options?: Accessor<CreateFragmentOptions>): Fragment<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: Accessor<FragmentRefs<T['name']> | null | undefined>, options?: Accessor<CreateFragmentOptions>): OptionalFragment<T>;
+};
+declare const createFragment: CreateFragmentFn;
 //#endregion
-export { ClientProvider, type ClientProviderProps, type CreateFragmentOptions, type CreateMutationOptions, type CreateQueryOptions, type CreateSubscriptionOptions, type Fragment, type Mutation, type MutationResult, type Query, type Subscription, createFragment, createMutation, createQuery, createSubscription, useClient };
+export { ClientProvider, type ClientProviderProps, type CreateFragmentOptions, type CreateMutationOptions, type CreateQueryOptions, type CreateSubscriptionOptions, type DefinedQuery, type Fragment, type FragmentList, type Mutation, type MutationResult, type OptionalFragment, type Query, type Subscription, createFragment, createMutation, createQuery, createSubscription, useClient };

package/dist/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import { AggregatedError } from "@mearie/core";
 import { createContext, createEffect, createSignal, onCleanup, untrack, useContext } from "solid-js";
-import { collect, peek, pipe, subscribe } from "@mearie/core/stream";
+import { collect, peek, pipe, subscribe, take } from "@mearie/core/stream";
 
 export * from "@mearie/core"
 
@@ -17,16 +17,19 @@ const useClient = () => {
 
 //#endregion
 //#region src/create-query.ts
-const createQuery = (query, ...[variables, options]) => {
+const createQuery = ((query, variables, options) => {
 	const client = useClient();
-	const [data, setData] = createSignal();
-	const [loading, setLoading] = createSignal(!options?.()?.skip);
+	const initialOpts = options?.();
+	const [data, setData] = createSignal(initialOpts?.initialData);
+	const [loading, setLoading] = createSignal(!initialOpts?.skip && !initialOpts?.initialData);
 	const [error, setError] = createSignal();
 	let unsubscribe = null;
+	let initialized = false;
 	const execute = () => {
 		unsubscribe?.();
 		if (options?.()?.skip) return;
-		setLoading(true);
+		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) => {
 			if (result.errors && result.errors.length > 0) {
@@ -60,7 +63,7 @@ const createQuery = (query, ...[variables, options]) => {
 		},
 		refetch
 	};
-};
+});
 
 //#endregion
 //#region src/create-subscription.ts
@@ -115,7 +118,7 @@ const createMutation = (mutation) => {
 		setLoading(true);
 		setError(void 0);
 		try {
-			const result = await pipe(client.executeMutation(mutation, variables, options), collect);
+			const result = await pipe(client.executeMutation(mutation, variables, options), take(1), collect);
 			if (result.errors && result.errors.length > 0) {
 				const err = new AggregatedError(result.errors);
 				setError(err);
@@ -146,14 +149,25 @@ const createMutation = (mutation) => {
 
 //#endregion
 //#region src/create-fragment.ts
-const createFragment = (fragment, fragmentRef, options) => {
+const createFragment = ((fragment, fragmentRef, options) => {
 	const client = useClient();
-	const result = pipe(client.executeFragment(fragment, fragmentRef(), options?.()), peek);
-	if (result.data === void 0) throw new Error("Fragment data not found");
-	const [data, setData] = createSignal(result.data);
+	const initialRef = fragmentRef();
+	let initialData;
+	if (initialRef == null) initialData = null;
+	else {
+		const result = pipe(client.executeFragment(fragment, initialRef, options?.()), peek);
+		if (result.data === void 0) throw new Error("Fragment data not found");
+		initialData = result.data;
+	}
+	const [data, setData] = createSignal(initialData);
 	createEffect(() => {
-		const unsubscribe = pipe(client.executeFragment(fragment, fragmentRef(), options?.()), subscribe({ next: (result$1) => {
-			if (result$1.data !== void 0) setData(() => result$1.data);
+		const currentRef = fragmentRef();
+		if (currentRef == null) {
+			setData(() => null);
+			return;
+		}
+		const unsubscribe = pipe(client.executeFragment(fragment, currentRef, options?.()), subscribe({ next: (result) => {
+			if (result.data !== void 0) setData(() => result.data);
 		} }));
 		onCleanup(() => {
 			unsubscribe();
@@ -162,7 +176,7 @@ const createFragment = (fragment, fragmentRef, options) => {
 	return { get data() {
 		return data();
 	} };
-};
+});
 
 //#endregion
 export { ClientProvider, createFragment, createMutation, createQuery, createSubscription, useClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearie/solid",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Type-safe, zero-overhead GraphQL client",
   "keywords": [
     "graphql",
@@ -28,9 +28,14 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
@@ -40,11 +45,11 @@
     "README.md"
   ],
   "dependencies": {
-    "@mearie/core": "0.1.2"
+    "@mearie/core": "0.2.1"
   },
   "devDependencies": {
-    "solid-js": "^1.9.10",
-    "tsdown": "^0.15.12",
+    "solid-js": "^1.9.11",
+    "tsdown": "^0.20.3",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
@@ -63,6 +68,6 @@
     "typecheck": "tsc"
   },
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts"
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts"
 }