@devite/nuxt-sanity 2.4.3 → 2.5.0

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/nuxt-sanity",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "configKey": "sanity",
   "builder": {
     "@nuxt/module-builder": "0.8.4",

package/dist/module.mjs

@@ -3,7 +3,7 @@ import { defineNuxtModule, createResolver, addPlugin, addServerHandler, addImpor
 import defu from 'defu';
 
 const name = "@devite/nuxt-sanity";
-const version = "2.4.3";
+const version = "2.5.0";
 
 const CONFIG_KEY = "sanity";
 const module = defineNuxtModule({
@@ -141,8 +141,8 @@ const module = defineNuxtModule({
     addImports(
       [
         // composables
-        { name: "useSanityQuery", from: resolve("runtime/composables/useSanityQuery") },
-        { name: "useLazySanityQuery", from: resolve("runtime/composables/useLazySanityQuery") },
+        { name: "useSanityQuery", from: resolve("runtime/composables/query") },
+        { name: "useLazySanityQuery", from: resolve("runtime/composables/query") },
         // helper methods
         { name: "groq", from: resolve("runtime/utils/groq") },
         { name: "resolveImageAssetById", from: resolve("runtime/utils/resolveImageAssetById") },

package/dist/runtime/client/DefaultSanityClient.d.ts

@@ -6,9 +6,9 @@ declare class DefaultSanityClient extends SanityClient {
     readonly client: SanityClientType;
     queryStore: QueryStore | null;
     constructor(config: ModuleOptions);
-    fetch<T = unknown>(query: string, params: QueryParams, options?: {
+    fetch<T>(query: string, params: QueryParams, options?: {
         perspective?: ClientPerspective;
-    }): Promise<T>;
+    }): Promise<T | null>;
     createQueryStore(tag?: string): void;
     clone(): DefaultSanityClient;
 }

package/dist/runtime/client/DefaultSanityClient.js

@@ -11,7 +11,12 @@ class DefaultSanityClient extends SanityClient {
     this.client = createClient(config);
   }
   async fetch(query, params, options) {
-    return await this.client.fetch(query, params, options);
+    try {
+      return await this.client.fetch(query, params, options);
+    } catch (error) {
+      console.error("Failed to fetch data from Sanity:", error);
+      return null;
+    }
   }
   createQueryStore(tag) {
     const queryStore = createCoreQueryStore({

package/dist/runtime/client/MinimalSanityClient.d.ts

@@ -9,7 +9,7 @@ declare class MinimalSanityClient extends SanityClient {
     private toQueryString;
     fetch<T>(query: string, params: QueryParams, _options?: {
         perspective?: ClientPerspective;
-    }): Promise<T>;
+    }): Promise<T | null>;
     clone(): MinimalSanityClient;
 }
 export default MinimalSanityClient;

package/dist/runtime/client/MinimalSanityClient.js

@@ -41,11 +41,16 @@ class MinimalSanityClient extends SanityClient {
     const useCache = minimalClientConfig.cachingEnabled && isEligibleForGetRequest;
     const cacheBaseUrl = import.meta.client ? minimalClientConfig.cacheClientBaseUrl : minimalClientConfig.cacheServerBaseUrl;
     const requestUrl = useCache && cacheBaseUrl ? cacheBaseUrl + minimalClientConfig.queryEndpoint : `https://${this.config.projectId}.${this.config.useCdn && isEligibleForGetRequest ? API_CDN_HOST : API_HOST}${this.queryPath}`;
-    return (await $fetch(requestUrl + queryString, {
-      ...this.fetchOptions,
-      method: isEligibleForGetRequest ? "GET" : "POST",
-      body: !isEligibleForGetRequest ? { query, params } : void 0
-    })).result;
+    try {
+      return (await $fetch(requestUrl + queryString, {
+        ...this.fetchOptions,
+        method: isEligibleForGetRequest ? "GET" : "POST",
+        body: !isEligibleForGetRequest ? { query, params } : void 0
+      })).result;
+    } catch (error) {
+      console.error("Failed to fetch data from Sanity:", error);
+      return null;
+    }
   }
   clone() {
     return new MinimalSanityClient({

package/dist/runtime/client/SanityClient.d.ts

@@ -1,10 +1,11 @@
 import type { ClientPerspective, ContentSourceMap, QueryParams } from '@sanity/client';
 import type { ModuleOptions } from '@devite/nuxt-sanity';
+export type SanityClientType = 'minimal' | 'default';
 export default abstract class SanityClient {
     config: ModuleOptions;
     sourceMap: ContentSourceMap | undefined;
     protected constructor(config: ModuleOptions);
-    abstract fetch<T = unknown>(query: string, params: QueryParams, options?: {
+    abstract fetch<T>(query: string, params: QueryParams, options?: {
         perspective?: ClientPerspective;
-    }): Promise<T>;
+    }): Promise<T | null>;
 }

package/dist/runtime/components/SanityPage.vue

@@ -14,9 +14,8 @@ import type { ImageAsset } from '@sanity/types'
 import type { GlobalSEO, Home, NotFound, Page } from '@devite/nuxt-sanity'
 import { setResponseStatus } from 'h3'
 import { IMAGE_WITHOUT_PREVIEW_PROJECTION } from '../utils/projections'
-import { useSanityQuery } from '../composables/useSanityQuery'
 import { groq } from '../utils/groq'
-import { useHead, useRoute, useRuntimeConfig, useSeoMeta, useRequestEvent } from '#imports'
+import { useHead, useRequestEvent, useRoute, useRuntimeConfig, useSanityQuery, useSeoMeta } from '#imports'
 
 const path = useRoute().path
 const groqFilter = path === '/' ? '_type == "home"' : `_type == "page" && slug.current == $slug`

package/dist/runtime/composables/{useSanityQuery.d.ts → query.d.ts}

@@ -1,12 +1,17 @@
+import type { AsyncDataOptions, AsyncDataRequestStatus } from 'nuxt/app';
 import type { ContentSourceMap, QueryParams } from '@sanity/client';
 import type { EncodeDataAttributeFunction } from '@sanity/core-loader/encode-data-attribute';
-import type { AsyncDataOptions, AsyncDataRequestStatus } from 'nuxt/app';
 import { type Ref } from 'vue';
+export interface UseSanityQueryOptions<T> extends AsyncDataOptions<T> {
+    client?: 'default' | 'minimal';
+    perspective?: 'previewDrafts' | 'published' | 'raw';
+}
 export interface SanityQueryResponse<T> {
     data: T;
     sourceMap?: ContentSourceMap;
     encodeDataAttribute?: EncodeDataAttributeFunction;
 }
+export type AsyncSanityData<T, E> = _AsyncSanityData<T, E> & Promise<_AsyncSanityData<T, E>>;
 interface AsyncDataExecuteOptions {
     _initial?: boolean;
     dedupe?: boolean;
@@ -21,10 +26,6 @@ export interface _AsyncSanityData<T, E> {
     error: Ref<E | null>;
     status: Ref<AsyncDataRequestStatus>;
 }
-export type AsyncSanityData<T, E> = _AsyncSanityData<T, E> & Promise<_AsyncSanityData<T, E>>;
-export interface UseSanityQueryOptions<T> extends AsyncDataOptions<T> {
-    client?: 'default' | 'minimal';
-    perspective?: 'previewDrafts' | 'published' | 'raw';
-}
-export declare const useSanityQuery: <T = unknown, E = Error>(query: string, _params?: QueryParams, _options?: UseSanityQueryOptions<SanityQueryResponse<T | null>>, lazy?: boolean) => AsyncSanityData<T | null, E>;
+export declare function useLazySanityQuery<T = unknown, E = Error>(query: string, params?: QueryParams, options?: UseSanityQueryOptions<SanityQueryResponse<T | null>>): AsyncSanityData<T | null, E>;
+export declare function useSanityQuery<T = unknown, E = Error>(query: string, _params?: QueryParams, options?: UseSanityQueryOptions<SanityQueryResponse<T | null>>, lazy?: boolean): AsyncSanityData<T | null, E>;
 export {};

package/dist/runtime/composables/query.js

@@ -0,0 +1,56 @@
+import { hash } from "ohash";
+import { useAsyncData, useLazyAsyncData } from "nuxt/app";
+import { reactive, ref } from "vue";
+import defu from "defu";
+import useSanityClient from "../utils/useSanityClient.js";
+import useServerSanityClient from "../server/utils/useSanityClient.js";
+import { useSanityVisualEditingState } from "./useSanityVisualEditingState.js";
+import { useRuntimeConfig } from "#imports";
+export function useLazySanityQuery(query, params = {}, options = {}) {
+  return useSanityQuery(query, params, options, true);
+}
+export function useSanityQuery(query, _params = {}, options = {}, lazy = false) {
+  const $config = useRuntimeConfig();
+  const sanityConfig = defu(import.meta.server ? $config.sanity : {}, $config.public.sanity);
+  const visualEditingEnabled = useSanityVisualEditingState().enabled;
+  const clientType = visualEditingEnabled ? "default" : options.client || (sanityConfig.minimalClient ? "minimal" : "default");
+  const perspective = options.perspective || (visualEditingEnabled ? "previewDrafts" : "published");
+  const reactiveParams = _params ? reactive(_params) : void 0;
+  if (reactiveParams) {
+    options.watch ||= [];
+    options.watch.push(reactiveParams);
+  }
+  const data = ref(null);
+  const sourceMap = ref(null);
+  const encodeDataAttribute = ref(() => {
+  });
+  function updateRefs(resultData, resultSourceMap, resultEncodeDataAttribute) {
+    data.value = resultData;
+    sourceMap.value = resultSourceMap || null;
+    if (resultEncodeDataAttribute) encodeDataAttribute.value = resultEncodeDataAttribute;
+  }
+  const fetchFunc = () => new Promise((resolve) => {
+    (visualEditingEnabled ? import("../utils/visualEditing/fetchSanityData.ts") : import("../utils/default/fetchSanityData.ts")).then(async ({ fetchSanityData }) => {
+      const client = import.meta.server ? useServerSanityClient(clientType, sanityConfig) : await useSanityClient(visualEditingEnabled, clientType, sanityConfig);
+      function onDataUpdate(resultData, resultSourceMap, resultEncodeDataAttribute) {
+        if (resultEncodeDataAttribute)
+          encodeDataAttribute.value = resultEncodeDataAttribute;
+        resolve({ data: resultData, sourceMap: resultSourceMap });
+      }
+      const fetchSanityDataFunc = fetchSanityData;
+      fetchSanityDataFunc(query, reactiveParams, client, perspective, onDataUpdate);
+    });
+  });
+  const key = "sanity-" + hash(query + (reactiveParams ? JSON.stringify(reactiveParams) : ""));
+  const pendingData = lazy ? useLazyAsyncData(key, fetchFunc, options) : useAsyncData(key, fetchFunc, options);
+  if (visualEditingEnabled && import.meta.client) {
+    import("../utils/visualEditing/subscribeToChanges.ts").then(async ({ subscribeToChanges }) => {
+      const client = await useSanityClient(visualEditingEnabled, clientType, sanityConfig);
+      subscribeToChanges(query, reactiveParams, client, updateRefs);
+    });
+  }
+  return Object.assign(new Promise((resolve) => pendingData.then(({ data: { value } }) => {
+    updateRefs(value.data, value.sourceMap);
+    resolve({ ...pendingData, data, sourceMap, encodeDataAttribute });
+  })), { ...pendingData, data, sourceMap, encodeDataAttribute });
+}

package/dist/runtime/composables/useSanityLiveMode.d.ts

@@ -1 +1 @@
-export declare const useSanityLiveMode: () => () => void;
+export declare const useSanityLiveMode: () => Promise<() => void>;

package/dist/runtime/composables/useSanityLiveMode.js

@@ -1,16 +1,12 @@
-import { onScopeDispose } from "vue";
 import useSanityClient from "../utils/useSanityClient.js";
-export const useSanityLiveMode = () => {
-  let disable = () => {
-  };
+import { useRuntimeConfig } from "#imports";
+export const useSanityLiveMode = async () => {
   if (import.meta.client) {
-    const client = useSanityClient("default");
+    const client = await useSanityClient(true, "default", useRuntimeConfig().public.sanity);
     if (client.queryStore) {
-      disable = client.queryStore.enableLiveMode({
-        client: client.client
-      });
+      return client.queryStore.enableLiveMode({ client: client.client });
     }
   }
-  onScopeDispose(disable);
-  return disable;
+  return () => {
+  };
 };

package/dist/runtime/plugins/visual-editing.js

@@ -6,7 +6,7 @@ import {
   useCookie,
   useRuntimeConfig
 } from "#imports";
-export default defineNuxtPlugin(() => {
+export default defineNuxtPlugin(async () => {
   const visualEditingState = useSanityVisualEditingState();
   const $config = useRuntimeConfig();
   const { visualEditing } = $config.public.sanity;
@@ -24,7 +24,7 @@ export default defineNuxtPlugin(() => {
           refresh: visualEditing?.refresh,
           zIndex: visualEditing?.zIndex
         });
-        if (visualEditing?.mode === "live-visual-editing") useSanityLiveMode();
+        if (visualEditing?.mode === "live-visual-editing") await useSanityLiveMode();
         break;
     }
   }

package/dist/runtime/server/routes/cache/asset.js

@@ -1,7 +1,7 @@
 import { createError, defineEventHandler, getRequestURL } from "h3";
 import { hash } from "ohash";
+import { useStorage } from "nitropack/runtime/internal/storage";
 import resolveSanityImageUrl from "../../utils/resolveSanityImageUrl.js";
-import { useStorage } from "#imports";
 const TTL = 60 * 60 * 24 * 365;
 export default defineEventHandler(async (event) => {
   const queryParams = getRequestURL(event).searchParams;

package/dist/runtime/server/routes/cache/query.d.ts

@@ -1,5 +1,5 @@
 declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
-    result: any;
+    result: string | number | true | object;
 } | {
     result?: undefined;
 }>>;

package/dist/runtime/server/routes/cache/query.js

@@ -5,8 +5,9 @@ import {
   setResponseHeader
 } from "h3";
 import { hash } from "ohash";
+import { useStorage } from "nitropack/runtime/internal/storage";
 import useSanityClient from "../../utils/useSanityClient.js";
-import { useRuntimeConfig, useStorage } from "#imports";
+import { useRuntimeConfig } from "#imports";
 const TTL = 60 * 60 * 8;
 export default defineEventHandler(async (event) => {
   const url = getRequestURL(event);
@@ -38,7 +39,7 @@ export default defineEventHandler(async (event) => {
     { perspective }
   );
   if (!result)
-    throw createError({ statusCode: 400, statusMessage: "Invalid query" });
+    throw createError({ statusCode: 404, statusMessage: "No results" });
   setResponseHeader(event, "Content-Type", "application/json");
   if (Object.keys(result).length === 0)
     return {};

package/dist/runtime/server/routes/cache/webhook.js

@@ -1,6 +1,7 @@
 import { createHmac } from "node:crypto";
-import { defineEventHandler, readRawBody, setResponseStatus, getRequestHeader } from "h3";
-import { useRuntimeConfig, useStorage } from "#imports";
+import { defineEventHandler, getRequestHeader, readRawBody, setResponseStatus } from "h3";
+import { useStorage } from "nitropack/runtime/internal/storage";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
   const body = await readRawBody(event);
   const signatureHeader = getRequestHeader(event, "sanity-webhook-signature");

package/dist/runtime/server/utils/useSanityClient.d.ts

@@ -1,3 +1,4 @@
+import type { ModuleOptions } from '@devite/nuxt-sanity';
 import type SanityClient from '../../client/SanityClient.js';
-import type { SanityClientType } from '../../utils/getOrCreateSanityClient.js';
-export default function useSanityClient(type?: SanityClientType): SanityClient;
+import type { SanityClientType } from '../../client/SanityClient.js';
+export default function useSanityClient(type?: SanityClientType, config?: ModuleOptions): SanityClient;

package/dist/runtime/server/utils/useSanityClient.js

@@ -1,17 +1,20 @@
 import defu from "defu";
-import getOrCreateSanityClient from "../../utils/getOrCreateSanityClient.js";
+import DefaultSanityClient from "../../client/DefaultSanityClient.js";
+import MinimalSanityClient from "../../client/MinimalSanityClient.js";
 import { useRuntimeConfig } from "#imports";
-export default function useSanityClient(type) {
-  const $config = useRuntimeConfig();
-  const sanityConfig = defu($config.sanity, $config.public.sanity || {});
+const clients = {};
+export default function useSanityClient(type, config) {
+  const sanityConfig = config || defu(useRuntimeConfig().sanity, useRuntimeConfig().public.sanity || {});
   const visualEditingEnabled = type !== "minimal" && sanityConfig.visualEditing && sanityConfig.visualEditing.previewMode !== false;
-  return getOrCreateSanityClient(
-    visualEditingEnabled || false,
-    visualEditingEnabled ? {
-      ...sanityConfig,
-      token: sanityConfig.visualEditing?.token,
-      useCdn: false
-    } : sanityConfig,
-    type
-  );
+  const clientType = (type || (sanityConfig.minimalClient ? "minimal" : "default")) + (visualEditingEnabled ? "-visual-editing" : "");
+  if (clientType in clients) return clients[clientType];
+  const clientConfig = visualEditingEnabled ? {
+    ...sanityConfig,
+    token: sanityConfig.visualEditing?.token,
+    useCdn: false
+  } : sanityConfig;
+  const client = new (clientType === "minimal" ? MinimalSanityClient : DefaultSanityClient)(clientConfig);
+  if (visualEditingEnabled) client.createQueryStore();
+  clients[clientType] = client;
+  return client;
 }

package/dist/runtime/utils/default/fetchSanityData.d.ts

@@ -0,0 +1,5 @@
+import type { ClientPerspective, ContentSourceMap, QueryParams } from '@sanity/client';
+import type { Reactive } from 'vue';
+import type { EncodeDataAttributeFunction } from '@sanity/core-loader/encode-data-attribute';
+import type SanityClient from '../../client/SanityClient.js';
+export declare function fetchSanityData<T>(query: string, params: Reactive<QueryParams> | undefined, client: SanityClient, perspective: ClientPerspective, callback: (data: T | null, sourceMap?: ContentSourceMap, encodeDataAttribute?: EncodeDataAttributeFunction) => void): Promise<void>;

package/dist/runtime/utils/default/fetchSanityData.js

@@ -0,0 +1,5 @@
+export async function fetchSanityData(query, params, client, perspective, callback) {
+  client.fetch(query, params || {}, { perspective }).then((fetchResult) => {
+    callback(fetchResult);
+  });
+}

package/dist/runtime/utils/resolveImageAssetById.js

@@ -1,5 +1,8 @@
-import { useSanityQuery } from "../composables/useSanityQuery.js";
 import { IMAGE_ASSET_PROJECTION } from "./projections.js";
+import { useSanityQuery } from "#imports";
 export const resolveImageAssetById = async (id) => {
-  return useSanityQuery(`*[_type == "sanity.imageAsset" && _id == $assetId][0] ${IMAGE_ASSET_PROJECTION}`, { assetId: id }).data;
+  return (await useSanityQuery(
+    `*[_type == "sanity.imageAsset" && _id == $assetId][0] ${IMAGE_ASSET_PROJECTION}`,
+    { assetId: id }
+  )).data;
 };

package/dist/runtime/utils/resolveInternalLink.js

@@ -1,4 +1,7 @@
-import { useSanityQuery } from "../composables/useSanityQuery.js";
+import { useSanityQuery } from "#imports";
 export const resolveInternalLink = async (reference) => {
-  return useSanityQuery(`*[_id == $documentId][0] { '_type': 'linkInternal', 'slug': coalesce(slug.current, '/') }`, { documentId: reference._ref }).data;
+  return (await useSanityQuery(
+    `*[_id == $documentId][0] { '_type': 'linkInternal', 'slug': coalesce(slug.current, '/') }`,
+    { documentId: reference._ref }
+  )).data;
 };

package/dist/runtime/utils/useSanityClient.d.ts

@@ -1,2 +1,4 @@
+import type { ModuleOptions } from '@devite/nuxt-sanity';
 import type SanityClient from '../client/SanityClient.js';
-export default function useSanityClient(type?: 'minimal' | 'default'): SanityClient;
+import type { SanityClientType } from '../client/SanityClient.js';
+export default function useSanityClient(visualEditing: boolean, type: SanityClientType, config: ModuleOptions): Promise<SanityClient>;

package/dist/runtime/utils/useSanityClient.js

@@ -1,8 +1,13 @@
-import { useSanityVisualEditingState } from "../composables/useSanityVisualEditingState.js";
-import getOrCreateSanityClient from "./getOrCreateSanityClient.js";
-import { useRuntimeConfig } from "#imports";
-export default function useSanityClient(type) {
-  const $config = useRuntimeConfig();
-  const sanityConfig = $config.public.sanity;
-  return getOrCreateSanityClient(useSanityVisualEditingState().enabled, sanityConfig, type);
+const clients = {};
+export default async function useSanityClient(visualEditing, type, config) {
+  const clientType = visualEditing ? "default" : type;
+  if (clientType in clients) return clients[clientType];
+  const clientConfig = {
+    ...config,
+    stega: visualEditing && config.stega
+  };
+  const client = new (await (clientType === "minimal" ? import("../client/MinimalSanityClient.ts") : import("../client/DefaultSanityClient.ts"))).default(clientConfig);
+  if (visualEditing) client.createQueryStore();
+  clients[clientType] = client;
+  return client;
 }

package/dist/runtime/utils/visualEditing/fetchSanityData.d.ts

@@ -0,0 +1,5 @@
+import type { ClientPerspective, ContentSourceMap, QueryParams } from '@sanity/client';
+import type { Reactive } from 'vue';
+import { type EncodeDataAttributeFunction } from '@sanity/core-loader/encode-data-attribute';
+import type SanityClient from '../../client/SanityClient.js';
+export declare function fetchSanityData<T>(query: string, params: Reactive<QueryParams> | undefined, client: SanityClient, perspective: ClientPerspective, callback: (data: T | null, sourceMap?: ContentSourceMap, encodeDataAttribute?: EncodeDataAttributeFunction) => void): Promise<void>;

package/dist/runtime/utils/visualEditing/fetchSanityData.js

@@ -0,0 +1,21 @@
+import { defineEncodeDataAttribute } from "@sanity/core-loader/encode-data-attribute";
+export async function fetchSanityData(query, params, client, perspective, callback) {
+  function updateResult(data2, sourceMap2) {
+    const encodeDataAttribute = sourceMap2 ? defineEncodeDataAttribute(data2, sourceMap2, client.config.visualEditing?.studioUrl) : void 0;
+    callback(data2, sourceMap2, encodeDataAttribute);
+  }
+  const defaultClient = client;
+  const proxyClient = {
+    fetch: (query2, params2, options) => $fetch(client.config.visualEditing.proxyEndpoint || "/_sanity/fetch", {
+      method: "POST",
+      body: { query: query2, params: params2, options }
+    })
+  };
+  const currentClient = import.meta.server ? defaultClient.queryStore.unstable__serverClient.instance || defaultClient.client : proxyClient;
+  const { result: data, resultSourceMap: sourceMap } = await currentClient.fetch(query, params || {}, {
+    perspective,
+    filterResponse: false,
+    resultSourceMap: "withKeyArraySelector"
+  });
+  updateResult(data, sourceMap);
+}

package/dist/runtime/utils/visualEditing/subscribeToChanges.d.ts

@@ -0,0 +1,5 @@
+import { type Reactive } from 'vue';
+import type { ContentSourceMap, QueryParams } from '@sanity/client';
+import type { EncodeDataAttributeFunction } from '@sanity/core-loader/encode-data-attribute';
+import type SanityClient from '../../client/SanityClient.js';
+export declare const subscribeToChanges: <T, E>(query: string, params: Reactive<QueryParams> | undefined, client: SanityClient, updateData: (data: T, sourceMap?: ContentSourceMap, encodeDataAttribute?: EncodeDataAttributeFunction) => void) => void;

package/dist/runtime/utils/visualEditing/subscribeToChanges.js

@@ -0,0 +1,19 @@
+import { toRaw } from "vue";
+import { defineEncodeDataAttribute } from "@sanity/core-loader/encode-data-attribute";
+export const subscribeToChanges = (query, params, client, updateData) => {
+  let unsubscribe = () => {
+  };
+  function setupFetcher(cb) {
+    unsubscribe();
+    const deepClonedParams = params ? JSON.parse(JSON.stringify(toRaw(params))) : void 0;
+    const fetcher = client.queryStore.createFetcherStore(query, deepClonedParams, void 0);
+    unsubscribe = fetcher.subscribe((newSnapshot) => {
+      if (newSnapshot.data) {
+        const encodeDataAttribute = newSnapshot.sourceMap ? defineEncodeDataAttribute(newSnapshot.data, newSnapshot.sourceMap, client.config.visualEditing?.studioUrl) : void 0;
+        updateData(newSnapshot.data, newSnapshot.sourceMap, encodeDataAttribute);
+        cb?.(newSnapshot);
+      }
+    });
+  }
+  setupFetcher();
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/nuxt-sanity",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "description": "Advanced Sanity integration for Nuxt.js.",
   "repository": "devite-io/nuxt-sanity",
   "license": "MIT",
@@ -45,6 +45,7 @@
     "eslint": "^9.17.0",
     "h3": "^1.13.0",
     "nuxt": "^3.14.1592",
+    "react": "18.3.1",
     "typescript": "~5.6.3",
     "vitest": "^2.1.8",
     "vitest-environment-nuxt": "1.0.1",

package/dist/runtime/composables/useLazySanityQuery.d.ts

@@ -1,4 +0,0 @@
-import type { AsyncDataOptions } from 'nuxt/app';
-import type { QueryParams } from '@sanity/client';
-import { type AsyncSanityData, type SanityQueryResponse } from './useSanityQuery.js';
-export declare const useLazySanityQuery: <T = unknown, E = Error>(query: string, _params?: QueryParams, options?: AsyncDataOptions<SanityQueryResponse<T | null>>) => AsyncSanityData<T | null, E>;

package/dist/runtime/composables/useLazySanityQuery.js

@@ -1,4 +0,0 @@
-import { useSanityQuery } from "./useSanityQuery.js";
-export const useLazySanityQuery = (query, _params = {}, options = {}) => {
-  return useSanityQuery(query, _params, options, true);
-};

package/dist/runtime/composables/useSanityQuery.js

@@ -1,69 +0,0 @@
-import { hash } from "ohash";
-import { defineEncodeDataAttribute } from "@sanity/core-loader/encode-data-attribute";
-import { onScopeDispose, reactive, ref } from "vue";
-import useSanityClient from "../utils/useSanityClient.js";
-import { useAsyncData, useLazyAsyncData } from "#imports";
-export const useSanityQuery = (query, _params = {}, _options = {}, lazy = false) => {
-  const { client: clientType, perspective: _perspective, ...options } = _options;
-  const client = clientType ? useSanityClient(clientType) : useSanityClient();
-  const hasQueryStore = "queryStore" in client && client.queryStore !== null;
-  const perspective = _perspective || (hasQueryStore ? "previewDrafts" : "published");
-  const reactiveParams = _params ? reactive(_params) : void 0;
-  if (reactiveParams) {
-    options.watch ||= [];
-    options.watch.push(reactiveParams);
-  }
-  const key = "sanity-" + hash(query + (reactiveParams ? JSON.stringify(reactiveParams) : ""));
-  const data = ref(null);
-  const sourceMap = ref(null);
-  const encodeDataAttribute = ref(() => {
-  });
-  function updateResult(newData, newSourceMap) {
-    data.value = newData;
-    sourceMap.value = newSourceMap || null;
-    if (client.config.visualEditing) {
-      encodeDataAttribute.value = defineEncodeDataAttribute(newData, newSourceMap, client.config.visualEditing?.studioUrl);
-    }
-  }
-  let fetchFunc = async () => {
-    return { data: await client.fetch(query, reactiveParams || {}, { perspective }) };
-  };
-  if (hasQueryStore) {
-    let setupFetcher = function(cb) {
-      unsubscribe();
-      const deepClonedParams = _params ? JSON.parse(JSON.stringify(_params)) : void 0;
-      const fetcher = defaultClient.queryStore.createFetcherStore(query, deepClonedParams, void 0);
-      unsubscribe = fetcher.subscribe((newSnapshot) => {
-        if (newSnapshot.data) {
-          updateResult(newSnapshot.data, newSnapshot.sourceMap);
-          cb?.(newSnapshot);
-        }
-      });
-    };
-    const defaultClient = client;
-    let unsubscribe = () => {
-    };
-    const proxyClient = {
-      fetch: (query2, params, options2) => $fetch(defaultClient.config.visualEditing.proxyEndpoint || "/_sanity/fetch", {
-        method: "POST",
-        body: { query: query2, params, options: options2 }
-      })
-    };
-    fetchFunc = async () => {
-      const currentClient = import.meta.server ? defaultClient.queryStore.unstable__serverClient.instance || defaultClient.client : proxyClient;
-      const { result: fetchData, resultSourceMap: sourceMap2 } = await currentClient.fetch(query, reactiveParams || {}, {
-        perspective,
-        filterResponse: false,
-        resultSourceMap: "withKeyArraySelector"
-      });
-      return sourceMap2 ? { data: fetchData, sourceMap: sourceMap2 } : { data: fetchData };
-    };
-    if (import.meta.client) setupFetcher();
-    onScopeDispose(unsubscribe);
-  }
-  const pendingData = lazy ? useLazyAsyncData(key, fetchFunc, options) : useAsyncData(key, fetchFunc, options);
-  return Object.assign(new Promise((resolve) => pendingData.then(({ data: { value } }) => {
-    updateResult(value.data, value.sourceMap);
-    resolve({ ...pendingData, data, sourceMap, encodeDataAttribute });
-  })), { ...pendingData, data, sourceMap, encodeDataAttribute });
-};

package/dist/runtime/utils/getOrCreateSanityClient.d.ts

@@ -1,4 +0,0 @@
-import type { ModuleOptions } from '@devite/nuxt-sanity';
-import type SanityClient from '../client/SanityClient.js';
-export type SanityClientType = 'minimal' | 'default';
-export default function getOrCreateSanityClient(visualEditing: boolean, config: ModuleOptions, type?: SanityClientType): SanityClient;

package/dist/runtime/utils/getOrCreateSanityClient.js

@@ -1,15 +0,0 @@
-import MinimalSanityClient from "../client/MinimalSanityClient.js";
-import DefaultSanityClient from "../client/DefaultSanityClient.js";
-const clients = {};
-export default function getOrCreateSanityClient(visualEditing, config, type) {
-  const clientType = visualEditing ? "default" : type || (config.minimalClient ? "minimal" : "default");
-  if (clientType in clients) return clients[clientType];
-  const clientConfig = {
-    ...config,
-    stega: visualEditing && config.stega
-  };
-  const client = clientType === "minimal" ? new MinimalSanityClient(clientConfig) : new DefaultSanityClient(clientConfig);
-  if (visualEditing && import.meta.client) client.createQueryStore();
-  clients[clientType] = client;
-  return client;
-}