@laioutr/app-hygraph 1.5.0 → 1.6.1

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@laioutr/app-hygraph",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "configKey": "@laioutr/app-hygraph",
   "builder": {
     "@nuxt/module-builder": "1.0.1",

package/dist/module.mjs

@@ -3,7 +3,7 @@ import { defu } from 'defu';
 import { registerLaioutrApp } from '@laioutr-core/kit';
 
 const name = "@laioutr/app-hygraph";
-const version = "1.5.0";
+const version = "1.6.1";
 
 const module = defineNuxtModule({
   meta: {

package/dist/runtime/server/generated/graphql.d.ts

@@ -8059,6 +8059,7 @@ export type BlogsQueryVariables = Exact<{
     skip?: InputMaybe<Scalars['Int']['input']>;
     first?: InputMaybe<Scalars['Int']['input']>;
     collectionId?: InputMaybe<Scalars['ID']['input']>;
+    locales: Array<Locale> | Locale;
 }>;
 export type BlogsQuery = {
     blogs: Array<{
@@ -8086,6 +8087,7 @@ export type BlogsQuery = {
 };
 export type BlogPostBySlugQueryVariables = Exact<{
     slug: Scalars['String']['input'];
+    locales: Array<Locale> | Locale;
 }>;
 export type BlogPostBySlugQuery = {
     blog?: {
@@ -8108,6 +8110,7 @@ export type BlogPostBySlugQuery = {
 };
 export type BlogCollectionBySlugQueryVariables = Exact<{
     slug: Scalars['String']['input'];
+    locales: Array<Locale> | Locale;
 }>;
 export type BlogCollectionBySlugQuery = {
     blogCollection?: {
@@ -8117,7 +8120,7 @@ export type BlogCollectionBySlugQuery = {
     } | null;
 };
 export type BlogCollectionsQueryVariables = Exact<{
-    [key: string]: never;
+    locales: Array<Locale> | Locale;
 }>;
 export type BlogCollectionsQuery = {
     blogCollections: Array<{

package/dist/runtime/server/hygraph-utils/locale.d.ts

@@ -0,0 +1,11 @@
+import { Locale } from '../generated/graphql.js';
+/**
+ * Build the Hygraph `locales` argument from the request's clientEnv locale.
+ *
+ * The first entry is the requested locale; `Locale.En` is appended as fallback
+ * (since `en` is the system locale in Hygraph) so that documents which are not
+ * yet translated still resolve with their default-locale fields instead of
+ * returning null fields. If the requested locale is already `en`, no fallback
+ * is added.
+ */
+export declare const resolveHygraphLocales: (clientLocale: string) => Locale[];

package/dist/runtime/server/hygraph-utils/locale.js

@@ -0,0 +1,12 @@
+import { Locale } from "../generated/graphql.js";
+const getMatchingLocales = (locale) => {
+  const validLocales = Object.values(Locale);
+  return locale.replace("_", "-").split("-").map((val) => val.toLowerCase()).filter((val) => validLocales.includes(val));
+};
+export const resolveHygraphLocales = (clientLocale) => {
+  const matchingLocales = getMatchingLocales(clientLocale);
+  if (matchingLocales.length === 0) {
+    return [Locale.En];
+  }
+  return [...matchingLocales, Locale.En];
+};

package/dist/runtime/server/hygraph-utils/mediaMapper.d.ts

@@ -1,4 +1,4 @@
-import { MediaImage } from '@laioutr-core/core-types/common';
+import { Media } from '@laioutr-core/core-types/common';
 import type { HygraphAsset } from '../types/hygraph.js';
 /** Remove the file extension from a file name. */
 export declare const stripFileExtension: (fileName: string) => string;
@@ -7,4 +7,4 @@ export declare const filenameToAlt: (fileName: string) => string;
 /**
  * Map a Hygraph asset to a Media object.
  */
-export declare const mapHygraphMedia: (asset: HygraphAsset) => MediaImage;
+export declare const mapHygraphMedia: (asset: HygraphAsset) => Media;

package/dist/runtime/server/hygraph-utils/mediaMapper.js

@@ -1,16 +1,34 @@
 export const stripFileExtension = (fileName) => fileName.replace(/\.[^.]+$/, "");
 export const filenameToAlt = (fileName) => stripFileExtension(fileName).replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[-_]+/g, " ").replace(/^\w/, (c) => c.toUpperCase()).trim();
-export const mapHygraphMedia = (asset) => ({
-  type: "image",
-  sources: [
-    {
-      // SVGs are returned as none so Nuxt Image won't turn them into PNG file links.
-      provider: asset.mimeType === "image/svg+xml" ? "none" : "hygraph",
-      src: asset.url,
-      width: asset.width ?? void 0,
-      height: asset.height ?? void 0,
-      responsive: "static"
-    }
-  ],
-  alt: filenameToAlt(asset.fileName)
-});
+export const mapHygraphMedia = (asset) => {
+  const mimeType = typeof asset.mimeType === "string" ? asset.mimeType : "";
+  if (mimeType.startsWith("video/")) {
+    return {
+      type: "video",
+      sources: [
+        {
+          provider: "hygraph",
+          src: asset.url,
+          width: asset.width ?? void 0,
+          height: asset.height ?? void 0,
+          format: mimeType.slice("video/".length)
+        }
+      ],
+      alt: filenameToAlt(asset.fileName)
+    };
+  }
+  return {
+    type: "image",
+    sources: [
+      {
+        // SVGs are returned as none so Nuxt Image won't turn them into PNG file links.
+        provider: mimeType === "image/svg+xml" ? "none" : "hygraph",
+        src: asset.url,
+        width: asset.width ?? void 0,
+        height: asset.height ?? void 0,
+        responsive: "static"
+      }
+    ],
+    alt: filenameToAlt(asset.fileName)
+  };
+};

package/dist/runtime/server/orchestr/blog/blogCollectionBySlug.query.js

@@ -1,12 +1,14 @@
 import { BlogCollectionBySlug } from "@laioutr-core/canonical-types/blog";
 import { blogCollectionToken } from "../../const/passthroughTokens.js";
+import { resolveHygraphLocales } from "../../hygraph-utils/locale.js";
 import { defineHygraph } from "../../middleware/defineHygraph.js";
 import { BLOG_COLLECTION_BY_SLUG_QUERY } from "../../queries/blog.js";
 export default defineHygraph.queryHandler({
   implements: BlogCollectionBySlug,
-  run: async ({ context, input, passthrough }) => {
+  run: async ({ context, input, passthrough, clientEnv }) => {
     const result = await context.hygraph.request(BLOG_COLLECTION_BY_SLUG_QUERY, {
-      slug: input.slug
+      slug: input.slug,
+      locales: resolveHygraphLocales(clientEnv.locale)
     });
     const collection = result.data.blogCollection;
     if (!collection) {

package/dist/runtime/server/orchestr/blog/blogCollectionBySlug.template.js

@@ -1,10 +1,13 @@
 import { BlogCollectionBySlug } from "@laioutr-core/canonical-types/blog";
+import { resolveHygraphLocales } from "../../hygraph-utils/locale.js";
 import { defineHygraph } from "../../middleware/defineHygraph.js";
 import { BLOG_COLLECTIONS_QUERY } from "../../queries/blog.js";
 export default defineHygraph.queryTemplateProvider({
   for: BlogCollectionBySlug,
-  run: async ({ context }) => {
-    const result = await context.hygraph.request(BLOG_COLLECTIONS_QUERY);
+  run: async ({ context, clientEnv }) => {
+    const result = await context.hygraph.request(BLOG_COLLECTIONS_QUERY, {
+      locales: resolveHygraphLocales(clientEnv.locale)
+    });
     return result.data.blogCollections.map((collection) => ({
       input: { slug: collection.slug },
       label: collection.title

package/dist/runtime/server/orchestr/blog/blogCollectionPosts.link.js

@@ -1,16 +1,19 @@
 import { BlogCollectionPostsLink } from "@laioutr-core/canonical-types/blog";
 import { blogPostsToken } from "../../const/passthroughTokens.js";
+import { resolveHygraphLocales } from "../../hygraph-utils/locale.js";
 import { defineHygraph } from "../../middleware/defineHygraph.js";
 import { BLOGS_QUERY } from "../../queries/blog.js";
 export default defineHygraph.linkHandler({
   implements: BlogCollectionPostsLink,
-  run: async ({ context, entityIds, pagination, passthrough }) => {
+  run: async ({ context, entityIds, pagination, passthrough, clientEnv }) => {
+    const locales = resolveHygraphLocales(clientEnv.locale);
     const results = await Promise.all(
       entityIds.map(
         (id) => context.hygraph.request(BLOGS_QUERY, {
           skip: pagination.offset,
           first: pagination.limit,
-          collectionId: id
+          collectionId: id,
+          locales
         })
       )
     );

package/dist/runtime/server/orchestr/blog/blogPostBySlug.query.js

@@ -1,12 +1,14 @@
 import { BlogPostBySlug, BlogPostBySlugNotFoundError } from "@laioutr-core/canonical-types/blog";
 import { blogPostsToken } from "../../const/passthroughTokens.js";
+import { resolveHygraphLocales } from "../../hygraph-utils/locale.js";
 import { defineHygraph } from "../../middleware/defineHygraph.js";
 import { BLOG_POST_BY_SLUG_QUERY } from "../../queries/blog.js";
 export default defineHygraph.queryHandler({
   implements: BlogPostBySlug,
-  run: async ({ context, input, passthrough }) => {
+  run: async ({ context, input, passthrough, clientEnv }) => {
     const result = await context.hygraph.request(BLOG_POST_BY_SLUG_QUERY, {
-      slug: input.slug
+      slug: input.slug,
+      locales: resolveHygraphLocales(clientEnv.locale)
     });
     const post = result.data.blog;
     if (!post) {

package/dist/runtime/server/queries/blog.d.ts

@@ -1,4 +1,4 @@
-export declare const BLOGS_QUERY = "\n  #graphql\n  \n  #graphql\n  \n  #graphql\n  fragment Asset on Asset {\n    url\n    fileName\n    mimeType\n    width\n    height\n    handle\n  }\n\n  fragment Blog on Blog {\n    id\n    title\n    slug\n    content {\n      html\n    }\n    image {\n      ...Asset\n    }\n    publishedAt\n  }\n\n  query Blogs($skip: Int, $first: Int, $collectionId: ID) {\n    blogs(skip: $skip, first: $first, orderBy: createdAt_DESC, where: { blogCollection: { id: $collectionId } }) {\n      ...Blog\n    }\n    blogsConnection {\n      aggregate {\n        count\n      }\n    }\n  }\n";
-export declare const BLOG_POST_BY_SLUG_QUERY = "\n  #graphql\n  \n  #graphql\n  \n  #graphql\n  fragment Asset on Asset {\n    url\n    fileName\n    mimeType\n    width\n    height\n    handle\n  }\n\n  fragment Blog on Blog {\n    id\n    title\n    slug\n    content {\n      html\n    }\n    image {\n      ...Asset\n    }\n    publishedAt\n  }\n\n  query BlogPostBySlug($slug: String!) {\n    blog(where: { slug: $slug }) {\n      ...Blog\n    }\n  }\n";
-export declare const BLOG_COLLECTION_BY_SLUG_QUERY = "\n  #graphql\n  query BlogCollectionBySlug($slug: String!) {\n    blogCollection(where: { slug: $slug }) {\n      id\n      slug\n      title\n    }\n  }\n";
-export declare const BLOG_COLLECTIONS_QUERY = "\n  #graphql\n  query BlogCollections {\n    blogCollections {\n      slug\n      title\n    }\n  }\n";
+export declare const BLOGS_QUERY = "\n  #graphql\n  \n  #graphql\n  \n  #graphql\n  fragment Asset on Asset {\n    url\n    fileName\n    mimeType\n    width\n    height\n    handle\n  }\n\n  fragment Blog on Blog {\n    id\n    title\n    slug\n    content {\n      html\n    }\n    image {\n      ...Asset\n    }\n    publishedAt\n  }\n\n  query Blogs($skip: Int, $first: Int, $collectionId: ID, $locales: [Locale!]!) {\n    blogs(\n      skip: $skip\n      first: $first\n      orderBy: createdAt_DESC\n      where: { blogCollection: { id: $collectionId } }\n      locales: $locales\n    ) {\n      ...Blog\n    }\n    blogsConnection(where: { blogCollection: { id: $collectionId } }, locales: $locales) {\n      aggregate {\n        count\n      }\n    }\n  }\n";
+export declare const BLOG_POST_BY_SLUG_QUERY = "\n  #graphql\n  \n  #graphql\n  \n  #graphql\n  fragment Asset on Asset {\n    url\n    fileName\n    mimeType\n    width\n    height\n    handle\n  }\n\n  fragment Blog on Blog {\n    id\n    title\n    slug\n    content {\n      html\n    }\n    image {\n      ...Asset\n    }\n    publishedAt\n  }\n\n  query BlogPostBySlug($slug: String!, $locales: [Locale!]!) {\n    blog(where: { slug: $slug }, locales: $locales) {\n      ...Blog\n    }\n  }\n";
+export declare const BLOG_COLLECTION_BY_SLUG_QUERY = "\n  #graphql\n  query BlogCollectionBySlug($slug: String!, $locales: [Locale!]!) {\n    blogCollection(where: { slug: $slug }, locales: $locales) {\n      id\n      slug\n      title\n    }\n  }\n";
+export declare const BLOG_COLLECTIONS_QUERY = "\n  #graphql\n  query BlogCollections($locales: [Locale!]!) {\n    blogCollections(locales: $locales) {\n      slug\n      title\n    }\n  }\n";

package/dist/runtime/server/queries/blog.js

@@ -23,11 +23,17 @@ export const BLOGS_QUERY = (
   `
   #graphql
   ${BlogFragment}
-  query Blogs($skip: Int, $first: Int, $collectionId: ID) {
-    blogs(skip: $skip, first: $first, orderBy: createdAt_DESC, where: { blogCollection: { id: $collectionId } }) {
+  query Blogs($skip: Int, $first: Int, $collectionId: ID, $locales: [Locale!]!) {
+    blogs(
+      skip: $skip
+      first: $first
+      orderBy: createdAt_DESC
+      where: { blogCollection: { id: $collectionId } }
+      locales: $locales
+    ) {
       ...Blog
     }
-    blogsConnection {
+    blogsConnection(where: { blogCollection: { id: $collectionId } }, locales: $locales) {
       aggregate {
         count
       }
@@ -40,8 +46,8 @@ export const BLOG_POST_BY_SLUG_QUERY = (
   `
   #graphql
   ${BlogFragment}
-  query BlogPostBySlug($slug: String!) {
-    blog(where: { slug: $slug }) {
+  query BlogPostBySlug($slug: String!, $locales: [Locale!]!) {
+    blog(where: { slug: $slug }, locales: $locales) {
       ...Blog
     }
   }
@@ -51,8 +57,8 @@ export const BLOG_COLLECTION_BY_SLUG_QUERY = (
   /* GraphQL */
   `
   #graphql
-  query BlogCollectionBySlug($slug: String!) {
-    blogCollection(where: { slug: $slug }) {
+  query BlogCollectionBySlug($slug: String!, $locales: [Locale!]!) {
+    blogCollection(where: { slug: $slug }, locales: $locales) {
       id
       slug
       title
@@ -64,8 +70,8 @@ export const BLOG_COLLECTIONS_QUERY = (
   /* GraphQL */
   `
   #graphql
-  query BlogCollections {
-    blogCollections {
+  query BlogCollections($locales: [Locale!]!) {
+    blogCollections(locales: $locales) {
       slug
       title
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laioutr/app-hygraph",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "Laioutr Hygraph App",
   "repository": "your-org/@laioutr/app-hygraph",
   "license": "MIT",