@devite/nuxt-sanity 2.19.0 → 2.19.1

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/nuxt-sanity",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "configKey": "sanity",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -3,7 +3,7 @@ import defu from 'defu';
 import { randomBytes } from 'node:crypto';
 
 const name = "@devite/nuxt-sanity";
-const version = "2.19.0";
+const version = "2.19.1";
 
 const CONFIG_KEY = "sanity";
 const module$1 = defineNuxtModule({

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

@@ -6,11 +6,6 @@ export interface UseSanityQueryOptions<T> extends AsyncDataOptions<T> {
     client?: 'default' | 'minimal';
     perspective?: 'drafts' | 'preview-drafts' | '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;
@@ -26,6 +21,6 @@ export interface _AsyncSanityData<T, E> {
     error: Ref<E | null>;
     status: Ref<AsyncDataRequestStatus>;
 }
-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 declare function useLazySanityQuery<T = unknown, E = Error>(query: string, params?: QueryParams, options?: UseSanityQueryOptions<T | null>): AsyncSanityData<T | null, E>;
+export declare function useSanityQuery<T = unknown, E = Error>(query: string, _params?: QueryParams, options?: UseSanityQueryOptions<T | null>, lazy?: boolean): AsyncSanityData<T | null, E>;
 export {};

package/dist/runtime/composables/query.js

@@ -4,6 +4,7 @@ import { reactive, ref } from "vue";
 import defu from "defu";
 import useSanityClient from "../utils/useSanityClient.js";
 import { useSanityVisualEditingState } from "./visual_editing_state.js";
+import { useNuxtApp } from "#imports";
 import { useRuntimeConfig } from "#imports";
 export function useLazySanityQuery(query, params = {}, options = {}) {
   return useSanityQuery(query, params, options, true);
@@ -19,37 +20,45 @@ export function useSanityQuery(query, _params = {}, options = {}, lazy = false)
     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;
+    pendingData.data.value = resultData;
     sourceMap.value = resultSourceMap || null;
     if (resultEncodeDataAttribute) encodeDataAttribute.value = resultEncodeDataAttribute;
   }
-  const fetchFunc = () => new Promise((resolve) => {
-    (visualEditingEnabled ? import("../utils/visualEditing/fetchSanityData") : import("../utils/default/fetchSanityData")).then(async ({ fetchSanityData }) => {
-      const client = import.meta.server ? (await import("../server/utils/useSanityClient.js")).default(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 fetchFunc = () => {
+    const sanityFetchPromises = useNuxtApp()._sanityFetchPromises ||= /* @__PURE__ */ new Map();
+    if (sanityFetchPromises.has(key)) {
+      return sanityFetchPromises.get(key);
+    }
+    const fetchPromise = new Promise((resolve) => {
+      (visualEditingEnabled ? import("../utils/visualEditing/fetchSanityData") : import("../utils/default/fetchSanityData")).then(async ({ fetchSanityData }) => {
+        const client = import.meta.server ? (await import("../server/utils/useSanityClient.js")).default(clientType, sanityConfig) : await useSanityClient(visualEditingEnabled, clientType, sanityConfig);
+        function onDataUpdate(resultData, resultSourceMap, resultEncodeDataAttribute) {
+          updateRefs(resultData, resultSourceMap, resultEncodeDataAttribute);
+          resolve(resultData);
+          sanityFetchPromises.delete(key);
+        }
+        const fetchSanityDataFunc = fetchSanityData;
+        fetchSanityDataFunc(query, reactiveParams, client, perspective, onDataUpdate);
+      });
     });
-  });
+    sanityFetchPromises.set(key, fetchPromise);
+    return fetchPromise;
+  };
   const key = "sanity-" + hash(query + (reactiveParams ? JSON.stringify(reactiveParams) : ""));
   const pendingData = lazy ? useLazyAsyncData(key, fetchFunc, options) : useAsyncData(key, fetchFunc, options);
+  Object.assign(
+    pendingData,
+    { sourceMap, encodeDataAttribute }
+  );
   if (visualEditingEnabled && import.meta.client) {
     import("../utils/visualEditing/subscribeToChanges.js").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 });
+  return pendingData;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/nuxt-sanity",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "description": "Advanced Sanity integration for Nuxt.js.",
   "repository": "devite-io/nuxt-sanity",
   "license": "MIT",
@@ -26,6 +26,18 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "prepack": "nuxt-module-build build",
+    "dev": "nuxi dev playground",
+    "dev:cms": "cd playground/cms && pnpm dev",
+    "dev:build": "nuxi build playground",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
+    "release": "pnpm lint && pnpm test && pnpm prepack && git push && changelogen --release && pnpm publish --access=public && git push --follow-tags",
+    "lint": "eslint --fix .",
+    "test": "vitest run --passWithNoTests",
+    "test:watch": "vitest watch",
+    "test:types": "vue-tsc --noEmit"
+  },
   "dependencies": {
     "@nuxt/image": "^2.0.0",
     "@portabletext/vue": "^1.0.14",
@@ -58,6 +70,20 @@
     "vue-router": "^4.6.4",
     "vue-tsc": "^3.2.4"
   },
+  "pnpm": {
+    "overrides": {
+      "sharp": "0.34.4",
+      "css-tree": "2.2.1"
+    },
+    "onlyBuiltDependencies": [
+      "@parcel/watcher",
+      "@swc/core",
+      "esbuild",
+      "scrollmirror",
+      "sharp",
+      "yarn"
+    ]
+  },
   "resolutions": {
     "@devite/nuxt-sanity": "link:."
   },
@@ -65,16 +91,5 @@
     "externals": [
       "@sanity/client"
     ]
-  },
-  "scripts": {
-    "dev": "nuxi dev playground",
-    "dev:cms": "cd playground/cms && pnpm dev",
-    "dev:build": "nuxi build playground",
-    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
-    "release": "pnpm lint && pnpm test && pnpm prepack && git push && changelogen --release && pnpm publish --access=public && git push --follow-tags",
-    "lint": "eslint --fix .",
-    "test": "vitest run --passWithNoTests",
-    "test:watch": "vitest watch",
-    "test:types": "vue-tsc --noEmit"
   }
-}
+}