@mearie/vue 0.1.0 → 0.2.0

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 vue = require("vue");
-vue = __toESM(vue);
-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-plugin.ts
 const ClientKey = Symbol("mearie-client");
@@ -41,20 +16,23 @@ const useClient = () => {
 
 //#endregion
 //#region src/use-query.ts
-const useQuery = (query, ...[variables, options]) => {
+const useQuery = ((query, variables, options) => {
 	const client = useClient();
-	const data = (0, vue.ref)(void 0);
-	const loading = (0, vue.ref)(!(0, vue.toValue)(options)?.skip);
+	const initialOpts = (0, vue.toValue)(options);
+	const data = (0, vue.ref)(initialOpts?.initialData);
+	const loading = (0, vue.ref)(!initialOpts?.skip && !initialOpts?.initialData);
 	const error = (0, vue.ref)(void 0);
 	let unsubscribe = null;
+	let initialized = false;
 	const execute = () => {
 		unsubscribe?.();
 		if ((0, vue.toValue)(options)?.skip) return;
-		loading.value = true;
+		if (!initialized && initialOpts?.initialData) loading.value = true;
+		initialized = true;
 		error.value = void 0;
-		unsubscribe = (0, __mearie_core_stream.pipe)(client.executeQuery(query, (0, vue.toValue)(variables), (0, vue.toValue)(options)), (0, __mearie_core_stream.subscribe)({ next: (result) => {
+		unsubscribe = (0, _mearie_core_stream.pipe)(client.executeQuery(query, (0, vue.toValue)(variables), (0, vue.toValue)(options)), (0, _mearie_core_stream.subscribe)({ next: (result) => {
 			if (result.errors && result.errors.length > 0) {
-				error.value = new __mearie_core.AggregatedError(result.errors);
+				error.value = new _mearie_core.AggregatedError(result.errors);
 				loading.value = false;
 			} else {
 				data.value = result.data;
@@ -75,7 +53,7 @@ const useQuery = (query, ...[variables, options]) => {
 		error,
 		refetch: execute
 	};
-};
+});
 
 //#endregion
 //#region src/use-subscription.ts
@@ -90,9 +68,9 @@ const useSubscription = (subscription, ...[variables, options]) => {
 		if ((0, vue.toValue)(options)?.skip) return;
 		loading.value = true;
 		error.value = void 0;
-		unsubscribe = (0, __mearie_core_stream.pipe)(client.executeSubscription(subscription, (0, vue.toValue)(variables), (0, vue.toValue)(options)), (0, __mearie_core_stream.subscribe)({ next: (result) => {
+		unsubscribe = (0, _mearie_core_stream.pipe)(client.executeSubscription(subscription, (0, vue.toValue)(variables), (0, vue.toValue)(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);
 				error.value = err;
 				loading.value = false;
 				(0, vue.toValue)(options)?.onError?.(err);
@@ -128,9 +106,9 @@ const useMutation = (mutation) => {
 		loading.value = true;
 		error.value = 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);
 				error.value = err;
 				loading.value = false;
 				throw err;
@@ -139,7 +117,7 @@ const useMutation = (mutation) => {
 			loading.value = false;
 			return result.data;
 		} catch (err) {
-			if (err instanceof __mearie_core.AggregatedError) error.value = err;
+			if (err instanceof _mearie_core.AggregatedError) error.value = err;
 			loading.value = false;
 			throw err;
 		}
@@ -153,21 +131,32 @@ const useMutation = (mutation) => {
 
 //#endregion
 //#region src/use-fragment.ts
-const useFragment = (fragment, fragmentRef, ...[options]) => {
+const useFragment = ((fragment, fragmentRef, ...[options]) => {
 	const client = useClient();
-	const result = (0, __mearie_core_stream.pipe)(client.executeFragment(fragment, (0, vue.toValue)(fragmentRef), (0, vue.toValue)(options)), __mearie_core_stream.peek);
-	if (result.data === void 0) throw new Error("Fragment data not found");
-	const data = (0, vue.ref)(result.data);
+	const initialRef = (0, vue.toValue)(fragmentRef);
+	let initialData;
+	if (initialRef == null) initialData = null;
+	else {
+		const result = (0, _mearie_core_stream.pipe)(client.executeFragment(fragment, initialRef, (0, vue.toValue)(options)), _mearie_core_stream.peek);
+		if (result.data === void 0) throw new Error("Fragment data not found");
+		initialData = result.data;
+	}
+	const data = (0, vue.ref)(initialData);
 	(0, vue.watchEffect)((onCleanup) => {
-		const unsubscribe = (0, __mearie_core_stream.pipe)(client.executeFragment(fragment, (0, vue.toValue)(fragmentRef), (0, vue.toValue)(options)), (0, __mearie_core_stream.subscribe)({ next: (result$1) => {
-			if (result$1.data !== void 0) data.value = result$1.data;
+		const currentRef = (0, vue.toValue)(fragmentRef);
+		if (currentRef == null) {
+			data.value = null;
+			return;
+		}
+		const unsubscribe = (0, _mearie_core_stream.pipe)(client.executeFragment(fragment, currentRef, (0, vue.toValue)(options)), (0, _mearie_core_stream.subscribe)({ next: (result) => {
+			if (result.data !== void 0) data.value = result.data;
 		} }));
 		onCleanup(() => unsubscribe());
 	});
 	return { get data() {
 		return data.value;
 	} };
-};
+});
 
 //#endregion
 exports.ClientPlugin = ClientPlugin;
@@ -176,9 +165,9 @@ exports.useFragment = useFragment;
 exports.useMutation = useMutation;
 exports.useQuery = useQuery;
 exports.useSubscription = useSubscription;
-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

@@ -12,7 +12,7 @@ declare const ClientPlugin: {
 declare const useClient: <TMeta extends SchemaMeta = SchemaMeta>() => Client<TMeta>;
 //#endregion
 //#region src/use-query.d.ts
-type UseQueryOptions = QueryOptions & {
+type UseQueryOptions<T extends Artifact<'query'> = Artifact<'query'>> = QueryOptions<T> & {
   skip?: boolean;
 };
 type Query<T extends Artifact<'query'>> = {
@@ -31,7 +31,29 @@ type Query<T extends Artifact<'query'>> = {
   error: Ref<AggregatedError>;
   refetch: () => void;
 };
-declare const useQuery: <T extends Artifact<"query">>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, MaybeRefOrGetter<UseQueryOptions>?] : [MaybeRefOrGetter<VariablesOf<T>>, MaybeRefOrGetter<UseQueryOptions>?]) => Query<T>;
+type DefinedQuery<T extends Artifact<'query'>> = {
+  data: Ref<DataOf<T>>;
+  loading: Ref<true>;
+  error: Ref<undefined>;
+  refetch: () => void;
+} | {
+  data: Ref<DataOf<T>>;
+  loading: Ref<false>;
+  error: Ref<undefined>;
+  refetch: () => void;
+} | {
+  data: Ref<DataOf<T>>;
+  loading: Ref<false>;
+  error: Ref<AggregatedError>;
+  refetch: () => void;
+};
+type UseQueryFn = {
+  <T extends Artifact<'query'>>(query: T, variables: MaybeRefOrGetter<VariablesOf<T>> | undefined, options: MaybeRefOrGetter<UseQueryOptions<T> & {
+    initialData: DataOf<T>;
+  }>): DefinedQuery<T>;
+  <T extends Artifact<'query'>>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, MaybeRefOrGetter<UseQueryOptions<T>>?] : [MaybeRefOrGetter<VariablesOf<T>>, MaybeRefOrGetter<UseQueryOptions<T>>?]): Query<T>;
+};
+declare const useQuery: UseQueryFn;
 //#endregion
 //#region src/use-subscription.d.ts
 type Subscription<T extends Artifact<'subscription'>> = {
@@ -77,6 +99,17 @@ type UseFragmentOptions = FragmentOptions;
 type Fragment<T extends Artifact<'fragment'>> = {
   data: DataOf<T>;
 };
-declare const useFragment: <T extends Artifact<"fragment">>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T["name"]>>, ...[options]: [MaybeRefOrGetter<UseFragmentOptions>?]) => Fragment<T>;
+type FragmentList<T extends Artifact<'fragment'>> = {
+  data: DataOf<T>[];
+};
+type OptionalFragment<T extends Artifact<'fragment'>> = {
+  data: DataOf<T> | null;
+};
+type UseFragmentFn = {
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T['name']>[]>, ...options: [MaybeRefOrGetter<UseFragmentOptions>?]): FragmentList<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T['name']>>, ...options: [MaybeRefOrGetter<UseFragmentOptions>?]): Fragment<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T['name']> | null | undefined>, ...options: [MaybeRefOrGetter<UseFragmentOptions>?]): OptionalFragment<T>;
+};
+declare const useFragment: UseFragmentFn;
 //#endregion
-export { ClientPlugin, type ClientPluginOptions, type Fragment, type Mutation, type Query, type Subscription, type UseFragmentOptions, type UseMutationOptions, type UseQueryOptions, type UseSubscriptionOptions, useClient, useFragment, useMutation, useQuery, useSubscription };
+export { ClientPlugin, type ClientPluginOptions, type DefinedQuery, type Fragment, type FragmentList, type Mutation, type OptionalFragment, type Query, type Subscription, type UseFragmentOptions, type UseMutationOptions, type UseQueryOptions, type UseSubscriptionOptions, useClient, useFragment, useMutation, useQuery, useSubscription };

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

@@ -12,7 +12,7 @@ declare const ClientPlugin: {
 declare const useClient: <TMeta extends SchemaMeta = SchemaMeta>() => Client<TMeta>;
 //#endregion
 //#region src/use-query.d.ts
-type UseQueryOptions = QueryOptions & {
+type UseQueryOptions<T extends Artifact<'query'> = Artifact<'query'>> = QueryOptions<T> & {
   skip?: boolean;
 };
 type Query<T extends Artifact<'query'>> = {
@@ -31,7 +31,29 @@ type Query<T extends Artifact<'query'>> = {
   error: Ref<AggregatedError>;
   refetch: () => void;
 };
-declare const useQuery: <T extends Artifact<"query">>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, MaybeRefOrGetter<UseQueryOptions>?] : [MaybeRefOrGetter<VariablesOf<T>>, MaybeRefOrGetter<UseQueryOptions>?]) => Query<T>;
+type DefinedQuery<T extends Artifact<'query'>> = {
+  data: Ref<DataOf<T>>;
+  loading: Ref<true>;
+  error: Ref<undefined>;
+  refetch: () => void;
+} | {
+  data: Ref<DataOf<T>>;
+  loading: Ref<false>;
+  error: Ref<undefined>;
+  refetch: () => void;
+} | {
+  data: Ref<DataOf<T>>;
+  loading: Ref<false>;
+  error: Ref<AggregatedError>;
+  refetch: () => void;
+};
+type UseQueryFn = {
+  <T extends Artifact<'query'>>(query: T, variables: MaybeRefOrGetter<VariablesOf<T>> | undefined, options: MaybeRefOrGetter<UseQueryOptions<T> & {
+    initialData: DataOf<T>;
+  }>): DefinedQuery<T>;
+  <T extends Artifact<'query'>>(query: T, ...[variables, options]: VariablesOf<T> extends Record<string, never> ? [undefined?, MaybeRefOrGetter<UseQueryOptions<T>>?] : [MaybeRefOrGetter<VariablesOf<T>>, MaybeRefOrGetter<UseQueryOptions<T>>?]): Query<T>;
+};
+declare const useQuery: UseQueryFn;
 //#endregion
 //#region src/use-subscription.d.ts
 type Subscription<T extends Artifact<'subscription'>> = {
@@ -77,6 +99,17 @@ type UseFragmentOptions = FragmentOptions;
 type Fragment<T extends Artifact<'fragment'>> = {
   data: DataOf<T>;
 };
-declare const useFragment: <T extends Artifact<"fragment">>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T["name"]>>, ...[options]: [MaybeRefOrGetter<UseFragmentOptions>?]) => Fragment<T>;
+type FragmentList<T extends Artifact<'fragment'>> = {
+  data: DataOf<T>[];
+};
+type OptionalFragment<T extends Artifact<'fragment'>> = {
+  data: DataOf<T> | null;
+};
+type UseFragmentFn = {
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T['name']>[]>, ...options: [MaybeRefOrGetter<UseFragmentOptions>?]): FragmentList<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T['name']>>, ...options: [MaybeRefOrGetter<UseFragmentOptions>?]): Fragment<T>;
+  <T extends Artifact<'fragment'>>(fragment: T, fragmentRef: MaybeRefOrGetter<FragmentRefs<T['name']> | null | undefined>, ...options: [MaybeRefOrGetter<UseFragmentOptions>?]): OptionalFragment<T>;
+};
+declare const useFragment: UseFragmentFn;
 //#endregion
-export { ClientPlugin, type ClientPluginOptions, type Fragment, type Mutation, type Query, type Subscription, type UseFragmentOptions, type UseMutationOptions, type UseQueryOptions, type UseSubscriptionOptions, useClient, useFragment, useMutation, useQuery, useSubscription };
+export { ClientPlugin, type ClientPluginOptions, type DefinedQuery, type Fragment, type FragmentList, type Mutation, type OptionalFragment, type Query, type Subscription, type UseFragmentOptions, type UseMutationOptions, type UseQueryOptions, type UseSubscriptionOptions, useClient, useFragment, useMutation, useQuery, useSubscription };

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

@@ -1,6 +1,6 @@
 import { AggregatedError } from "@mearie/core";
 import { inject, ref, toValue, watchEffect } from "vue";
-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/use-query.ts
-const useQuery = (query, ...[variables, options]) => {
+const useQuery = ((query, variables, options) => {
 	const client = useClient();
-	const data = ref(void 0);
-	const loading = ref(!toValue(options)?.skip);
+	const initialOpts = toValue(options);
+	const data = ref(initialOpts?.initialData);
+	const loading = ref(!initialOpts?.skip && !initialOpts?.initialData);
 	const error = ref(void 0);
 	let unsubscribe = null;
+	let initialized = false;
 	const execute = () => {
 		unsubscribe?.();
 		if (toValue(options)?.skip) return;
-		loading.value = true;
+		if (!initialized && initialOpts?.initialData) loading.value = true;
+		initialized = true;
 		error.value = void 0;
 		unsubscribe = pipe(client.executeQuery(query, toValue(variables), toValue(options)), subscribe({ next: (result) => {
 			if (result.errors && result.errors.length > 0) {
@@ -51,7 +54,7 @@ const useQuery = (query, ...[variables, options]) => {
 		error,
 		refetch: execute
 	};
-};
+});
 
 //#endregion
 //#region src/use-subscription.ts
@@ -104,7 +107,7 @@ const useMutation = (mutation) => {
 		loading.value = true;
 		error.value = 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);
 				error.value = err;
@@ -129,21 +132,32 @@ const useMutation = (mutation) => {
 
 //#endregion
 //#region src/use-fragment.ts
-const useFragment = (fragment, fragmentRef, ...[options]) => {
+const useFragment = ((fragment, fragmentRef, ...[options]) => {
 	const client = useClient();
-	const result = pipe(client.executeFragment(fragment, toValue(fragmentRef), toValue(options)), peek);
-	if (result.data === void 0) throw new Error("Fragment data not found");
-	const data = ref(result.data);
+	const initialRef = toValue(fragmentRef);
+	let initialData;
+	if (initialRef == null) initialData = null;
+	else {
+		const result = pipe(client.executeFragment(fragment, initialRef, toValue(options)), peek);
+		if (result.data === void 0) throw new Error("Fragment data not found");
+		initialData = result.data;
+	}
+	const data = ref(initialData);
 	watchEffect((onCleanup) => {
-		const unsubscribe = pipe(client.executeFragment(fragment, toValue(fragmentRef), toValue(options)), subscribe({ next: (result$1) => {
-			if (result$1.data !== void 0) data.value = result$1.data;
+		const currentRef = toValue(fragmentRef);
+		if (currentRef == null) {
+			data.value = null;
+			return;
+		}
+		const unsubscribe = pipe(client.executeFragment(fragment, currentRef, toValue(options)), subscribe({ next: (result) => {
+			if (result.data !== void 0) data.value = result.data;
 		} }));
 		onCleanup(() => unsubscribe());
 	});
 	return { get data() {
 		return data.value;
 	} };
-};
+});
 
 //#endregion
 export { ClientPlugin, useClient, useFragment, useMutation, useQuery, useSubscription };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearie/vue",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Type-safe, zero-overhead GraphQL client",
   "keywords": [
     "graphql",
@@ -40,12 +40,12 @@
     "README.md"
   ],
   "dependencies": {
-    "@mearie/core": "0.1.0"
+    "@mearie/core": "0.2.0"
   },
   "devDependencies": {
-    "tsdown": "^0.15.12",
+    "tsdown": "^0.20.3",
     "typescript": "^5.9.3",
-    "vue": "^3.5.22"
+    "vue": "^3.5.29"
   },
   "peerDependencies": {
     "vue": "^3.3.0"