@graphcommerce/algolia-products 9.1.0-canary.28 → 9.1.0-canary.31

package/mesh/resolvers.ts

@@ -1,4 +1,4 @@
-import type { AlgoliasearchResponse, MeshContext, Resolvers } from '@graphcommerce/graphql-mesh'
+import type { AlgoliasearchResponse, Resolvers } from '@graphcommerce/graphql-mesh'
 import { hasSelectionSetPath } from '@graphcommerce/graphql-mesh'
 import type { GraphQLError, GraphQLResolveInfo } from 'graphql'
 import { algoliaFacetsToAggregations, getCategoryList } from './algoliaFacetsToAggregations'
@@ -7,11 +7,13 @@ import { algoliaHitToMagentoProduct } from './algoliaHitToMagentoProduct'
 import { getAlgoliaSettings } from './getAlgoliaSettings'
 import { getAttributeList } from './getAttributeList'
 import { getGroupId } from './getGroupId'
+import { getIndexName } from './getIndexName'
 import { getSearchResults } from './getSearchResults'
 import { getSearchSuggestions } from './getSearchSuggestions'
 import { isSuggestionsEnabled } from './getSearchSuggestionsInput'
 import { getStoreConfig } from './getStoreConfig'
-import { sortingOptions } from './sortOptions'
+import { sortAggregations } from './sortAggregations'
+import { sortFieldsOptions } from './sortFieldOptions'
 
 function isAlgoliaResponse<T extends object>(
   root: T,
@@ -42,12 +44,15 @@ export const resolvers: Resolvers = {
     aggregations: async (root, _args, context) => {
       if (!isAlgoliaResponse(root)) return root.aggregations ?? null
 
-      return algoliaFacetsToAggregations(
-        root.algoliaSearchResults?.facets,
-        await getAttributeList(context),
-        await getStoreConfig(context),
-        await getCategoryList(context),
-        getGroupId(context),
+      return sortAggregations(
+        algoliaFacetsToAggregations(
+          root.algoliaSearchResults?.facets,
+          await getAttributeList(context),
+          await getStoreConfig(context),
+          await getCategoryList(context),
+          getGroupId(context),
+        ),
+        root.algoliaSearchResults?.renderingContent,
       )
     },
 
@@ -55,12 +60,10 @@ export const resolvers: Resolvers = {
       if (isAlgoliaResponse(root)) {
         return {
           default: 'relevance',
-          options: Object.values(
-            sortingOptions(
-              await getAlgoliaSettings(context),
-              await getAttributeList(context),
-              context,
-            ),
+          options: sortFieldsOptions(
+            await getAlgoliaSettings(context),
+            await getAttributeList(context),
+            context,
           ),
         }
       }
@@ -69,13 +72,13 @@ export const resolvers: Resolvers = {
 
     total_count: (root) => {
       if (!isAlgoliaResponse(root)) return root.total_count ?? null
-      return root.algoliaSearchResults?.nbHits
+      return root.algoliaSearchResults?.nbHits ?? null
     },
 
     page_info: (root) => {
       if (!isAlgoliaResponse(root)) return root.page_info ?? null
       return {
-        current_page: root.algoliaSearchResults.page + 1,
+        current_page: (root.algoliaSearchResults.page ?? 0) + 1,
         page_size: root.algoliaSearchResults.hitsPerPage,
         total_pages: root.algoliaSearchResults.nbPages,
       }
@@ -97,23 +100,6 @@ export const resolvers: Resolvers = {
       return items
     },
   },
-  Customer: {
-    group_id: {
-      resolve: async (root, args, context, info) => {
-        const { headers } = context as MeshContext & {
-          headers?: Record<string, string | undefined>
-        }
-        if (!headers?.authorization) return 0
-        const customer = await context.m2rest.Query.m2rest_GetV1CustomersMe({
-          root,
-          context,
-          info,
-          autoSelectionSetWithDepth: 10,
-        })
-        return customer?.group_id ?? null
-      },
-    },
-  },
   Query: {
     products: async (root, args, context, info) => {
       const isAgolia = (args.filter?.engine?.in ?? [args.filter?.engine?.eq])[0] === 'algolia'
@@ -127,7 +113,6 @@ export const resolvers: Resolvers = {
         getSearchSuggestions(args.search, context)
 
       const searchResults = hasSearchRequest(info) ? getSearchResults(args, context, info) : null
-
       if (isGraphQLError(await searchResults))
         return context.m2.Query.products({ root, args, context, info })
 
@@ -135,6 +120,7 @@ export const resolvers: Resolvers = {
         algoliaSearchResults: await searchResults,
         suggestions: (await searchSuggestsions) || null,
         algolia_queryID: (await searchResults)?.queryID,
+        algolia_indexName: getIndexName(context),
       }
     },
   },

package/mesh/sortAggregations.ts

@@ -0,0 +1,23 @@
+import type { Aggregation, AlgoliasearchResponse } from '@graphcommerce/graphql-mesh'
+
+/** Sort the aggregations based on the ordering given by Algolia. */
+export function sortAggregations(
+  aggregations: Aggregation[],
+  renderingContent: AlgoliasearchResponse['renderingContent'],
+) {
+  const order = renderingContent?.facetOrdering?.facets?.order
+  /** @todo: Algolia also supports sorting the attribute values. */
+  // const values = renderingContent?.facetOrdering?.values?.additionalProperties
+
+  if (!order) return aggregations
+
+  return aggregations
+    .sort(
+      (a, b) =>
+        (order.indexOf(a.attribute_code) ?? Infinity) -
+        (order.indexOf(b.attribute_code) ?? Infinity),
+    )
+    .filter((value) =>
+      order.find((sortedAttributeCode) => value.attribute_code === sortedAttributeCode),
+    )
+}

package/mesh/{sortOptions.ts → sortFieldOptions.ts}

@@ -1,21 +1,16 @@
-import type {
-  AlgoliasettingsResponse,
-  MeshContext,
-  ProductAttributeSortInput,
-  SortEnum,
-  SortField,
-} from '@graphcommerce/graphql-mesh'
+import type { MeshContext, SortEnum, SortField } from '@graphcommerce/graphql-mesh'
 import { nonNullable } from '@graphcommerce/magento-customer'
+import type { GetAlgoliaSettingsReturn } from './getAlgoliaSettings'
 import type { AttributeList } from './getAttributeList'
 import { getIndexName } from './getIndexName'
 
 export type SortingOptions = Record<string, SortField & { dirs: SortEnum[] }>
 
-export async function sortingOptions(
-  settings: AlgoliasettingsResponse,
+export function sortFieldsOptions(
+  settings: GetAlgoliaSettingsReturn,
   attributeList: AttributeList,
   context: MeshContext,
-): Promise<SortingOptions> {
+): SortField[] {
   const sortRecord: SortingOptions = {
     relevance: { label: 'Relevance', value: 'relevance', dirs: ['DESC'] },
   }
@@ -48,29 +43,10 @@ export async function sortingOptions(
           label: attributeList.find((attr) => attr.code === attributeCode)?.label,
           dirs: [curr.dir],
         }
-      } else {
+      } else if (!sortRecord[attributeCode].dirs.includes(curr.dir)) {
         sortRecord[attributeCode].dirs.push(curr.dir)
       }
     }, {})
 
-  return sortRecord
-}
-
-export async function getSortedIndex(
-  context: MeshContext,
-  settings: Promise<AlgoliasettingsResponse>,
-  sortInput: ProductAttributeSortInput | null = {},
-): Promise<string> {
-  const baseIndex = getIndexName(context)
-  // const availableSorting = Object.values(sortOptions)
-  const [attr, dir] = Object.entries(sortInput ?? {}).filter(nonNullable)?.[0] ?? []
-  if (!attr || !dir) return baseIndex
-
-  const found = (await settings).replicas?.find(
-    (replica) =>
-      replica?.startsWith(`virtual(${baseIndex}_${attr}`) &&
-      replica?.endsWith(`${dir?.toLowerCase()})`),
-  )
-
-  return found ? found?.slice(8, -1) : baseIndex
+  return Object.values(sortRecord)
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/algolia-products",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.1.0-canary.28",
+  "version": "9.1.0-canary.31",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -15,14 +15,14 @@
     "generate": "tsx scripts/generate-spec.mts"
   },
   "peerDependencies": {
-    "@graphcommerce/google-datalayer": "^9.1.0-canary.28",
-    "@graphcommerce/graphql": "^9.1.0-canary.28",
-    "@graphcommerce/graphql-mesh": "^9.1.0-canary.28",
-    "@graphcommerce/magento-customer": "^9.1.0-canary.28",
-    "@graphcommerce/magento-product": "^9.1.0-canary.28",
-    "@graphcommerce/magento-search": "^9.1.0-canary.28",
-    "@graphcommerce/next-config": "^9.1.0-canary.28",
-    "@graphcommerce/next-ui": "^9.1.0-canary.28",
+    "@graphcommerce/google-datalayer": "^9.1.0-canary.31",
+    "@graphcommerce/graphql": "^9.1.0-canary.31",
+    "@graphcommerce/graphql-mesh": "^9.1.0-canary.31",
+    "@graphcommerce/magento-customer": "^9.1.0-canary.31",
+    "@graphcommerce/magento-product": "^9.1.0-canary.31",
+    "@graphcommerce/magento-search": "^9.1.0-canary.31",
+    "@graphcommerce/next-config": "^9.1.0-canary.31",
+    "@graphcommerce/next-ui": "^9.1.0-canary.31",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/schema/AlgoliaSchema.graphqls

@@ -31,6 +31,9 @@ type AlgoliaProductHitAdditionalProperties {
   rating_summary: String
   thumbnail_url: String
   image_url: String
+
+  description: String
+  short_description: String
 }
 
 type Algoliahit {
@@ -57,4 +60,5 @@ input CategoryFilterInput {
 
 type Products {
   algolia_queryID: String
+  algolia_indexName: String
 }

package/scripts/generate-spec.mts

@@ -1,8 +1,8 @@
-import yaml from 'js-yaml'
 import { writeFile } from 'node:fs/promises'
+import conf from '@graphcommerce/prettier-config-pwa'
+import yaml from 'js-yaml'
 import type { OpenAPIV3 } from 'openapi-types'
 import prettier from 'prettier'
-import conf from '@graphcommerce/prettier-config-pwa'
 import { algoliaSchemaBaseFilter } from './base-schema-filter.mjs'
 
 const response = await fetch(
@@ -33,7 +33,7 @@ const newSchema: OpenAPIV3.Document = {
           const keys = ['post', 'get', 'put', 'delete', 'patch', 'options'] as const
 
           keys.forEach((method) => {
-            if (!newValue[method]?.['x-acl']?.some((value: string) => acl.includes(value))) {
+            if (!newValue[method]?.['x-acl']?.every((value: string) => acl.includes(value))) {
               newValue[method] = undefined
             }
           })