@gluhar/app 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.1](https://github.com/gluharry/gluhar/compare/@gluhar/app@2.5.0...@gluhar/app@2.5.1) (2025-01-28)
+
+
+### 🩹 Fixes
+
+- UsePages to useSanityPage ([23cc055](https://github.com/gluharry/gluhar/commit/23cc05564abb443bf76278d9e4de253bd820b07b))
+
+
+
+
+
 # [2.5.0](https://github.com/gluharry/gluhar/compare/@gluhar/app@2.4.6...@gluhar/app@2.5.0) (2025-01-28)
 
 

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@gluhar/app",
   "configKey": "gluhar",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "builder": {
     "@nuxt/module-builder": "0.8.3",
     "unbuild": "2.0.0"

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

@@ -0,0 +1,20 @@
+import type { AsyncDataRequestStatus } from "#app";
+import type { KeysOf, PickFrom } from "#app/composables/asyncData";
+import type { SanityPage } from "@gluhar/sanity/types";
+interface Page extends SanityPage {
+    _type: "page";
+}
+type PageTypeKeys = "page" | string;
+type PageInterfaces = Record<PageTypeKeys, Page | SanityPage>;
+type PageTypes<PI extends PageInterfaces> = Record<keyof PI, {
+    query: string;
+    slug: string;
+    type?: string;
+}>;
+export declare const useSanityPage: <PI extends PageInterfaces = {
+    page: Page;
+}, PT extends PageTypes<PI> = PageTypes<PI>>(types?: PT, slug?: string | string[]) => Promise<{
+    page: import("vue").Ref<PickFrom<PI[Extract<keyof PT, string>], KeysOf<PI[Extract<keyof PT, string>]>> | null, PickFrom<PI[Extract<keyof PT, string>], KeysOf<PI[Extract<keyof PT, string>]>> | null> | import("vue").Ref<Page | null, Page | null> | undefined;
+    status: import("vue").Ref<AsyncDataRequestStatus, AsyncDataRequestStatus> | undefined;
+}>;
+export {};

package/dist/runtime/composables/useSanityPage.js

@@ -0,0 +1,59 @@
+import {
+  getCanonicalUrl,
+  groq,
+  useHead,
+  useRoute,
+  useSanityQueryWithPreview
+} from "#imports";
+import { imageWithAsset, linkWithPage } from "@gluhar/sanity/query";
+export const useSanityPage = async (types, slug) => {
+  const route = useRoute();
+  const s = slug ? slug : route.params.slug;
+  const sl = Array.isArray(s) ? s : [s];
+  let page, status;
+  if (types && sl.length > 1) {
+    for (const type in types) {
+      const options = types[type];
+      if (sl[0] === options.slug) {
+        const query = groq`
+            *[_type == "${type}" && slug.current == "${sl[1]}"]{
+              ${options.query}
+            }[0]
+          `;
+        const q = await useSanityQueryWithPreview(query);
+        page = q.data;
+        status = q.status;
+      }
+    }
+  } else {
+    const pageQuery = groq`
+        ...,
+        content[]{
+          ...,
+          _ref != null => @-> {
+            ...,
+            button{ ${linkWithPage} },
+            thumbnail{ ${imageWithAsset} },
+            image{ ${imageWithAsset} },
+            images[]{ ${imageWithAsset} },
+            bckg{ ${imageWithAsset} },
+          }
+        }
+      `;
+    const query = groq`
+        *[_type == "page" && slug.current == "${sl[0] ? sl?.join("/") : "/"}"]{
+          ${types?.page?.query ?? pageQuery}
+        }[0]
+      `;
+    const q = await useSanityQueryWithPreview(query);
+    if (q.data.value) q.data.value._type = "page";
+    page = q.data;
+    status = q.status;
+  }
+  useHead({
+    link: [
+      { rel: "canonical", href: getCanonicalUrl(page?.value) }
+    ]
+  });
+  return { page, status };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gluhar/app",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Gluhar main package. This combines and configures @gluhar/theme, @gluhar/i18n, @gluhar/sanity and @gluhar/core into one main package. Provides numerous components, composables, utils and types.",
   "license": "MIT",
   "type": "module",
@@ -58,5 +58,5 @@
     "nuxt": "^3.13.1",
     "vitest": "^2.0.5"
   },
-  "gitHead": "542b0500e45cb34a71a94aedda03b89ed1fd0643"
+  "gitHead": "03d4d85e4be0a9d1220c16e2c1029c3aefedda01"
 }

package/dist/runtime/composables/usePages.js

@@ -1,63 +0,0 @@
-import {
-  getCanonicalUrl,
-  groq,
-  useHead,
-  useRoute,
-  useSanityQueryWithPreview
-} from "#imports";
-import { imageWithAsset, linkWithPage } from "@gluhar/sanity/query";
-export const usePages = (types) => {
-  const route = useRoute();
-  const getSanityPage = async (slug) => {
-    const s = slug ? slug : route.params.slug;
-    const sl = Array.isArray(s) ? s : [s];
-    if (types && sl.length > 1) {
-      for (const type in types) {
-        const options = types[type];
-        if (sl[0] === options.slug) {
-          const query2 = groq`
-            *[_type == "${type}" && slug.current == "${sl[1]}"]{
-              ${options.query}
-            }[0]
-          `;
-          const { data: data2, status: status2 } = await useSanityQueryWithPreview(query2);
-          useHead({
-            link: [
-              {
-                rel: "canonical",
-                href: getCanonicalUrl(data2.value)
-              }
-            ]
-          });
-          return { data: data2, status: status2 };
-        }
-      }
-    }
-    const pageQuery = groq`
-      ...,
-      content[]{
-        ...,
-        _ref != null => @-> {
-          ...,
-          button{ ${linkWithPage} },
-          thumbnail{ ${imageWithAsset} },
-          image{ ${imageWithAsset} },
-          images[]{ ${imageWithAsset} },
-          bckg{ ${imageWithAsset} },
-        }
-      }
-    `;
-    const query = groq`
-      *[_type == "page" && slug.current == "${sl[0] ? sl?.join("/") : "/"}"]{
-        ${types?.page?.query ?? pageQuery}
-      }[0]
-    `;
-    const { data, status } = await useSanityQueryWithPreview(query);
-    if (data.value) data.value._type = "page";
-    useHead({
-      link: [{ rel: "canonical", href: getCanonicalUrl(data.value) }]
-    });
-    return { page: data, status };
-  };
-  return { getSanityPage };
-};