@graphcommerce/algolia-products 9.1.0-canary.33 → 9.1.0-canary.35

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphcommerce/algolia-products
 
+## 9.1.0-canary.35
+
+## 9.1.0-canary.34
+
+### Patch Changes
+
+- [`08f9883`](https://github.com/graphcommerce-org/graphcommerce/commit/08f98833019e726759194a3c1492052f2df052fa) - Correctly detect numeric values from the backend. ([@paales](https://github.com/paales))
+
 ## 9.1.0-canary.33
 
 ## 9.1.0-canary.32

package/mesh/algoliaFacetsToAggregations.ts

@@ -5,6 +5,7 @@ import type {
   CategoryResult,
   MeshContext,
 } from '@graphcommerce/graphql-mesh'
+import type { FilterTypes } from '@graphcommerce/magento-product'
 import type { AttributeList } from './getAttributeList'
 import { getIndexName } from './getIndexName'
 import type { GetStoreConfigReturn } from './getStoreConfig'
@@ -76,6 +77,7 @@ export function algoliaFacetsToAggregations(
   algoliaFacets: AlgoliasearchResponse['facets'],
   attributes: AttributeList,
   storeConfig: GetStoreConfigReturn,
+  filterTypes: FilterTypes,
   categoryList?: null | CategoryResult,
   groupId?: number,
 ): Aggregation[] {
@@ -96,6 +98,7 @@ export function algoliaFacetsToAggregations(
 
     const label =
       attributes?.find((attribute) => attribute?.code === attribute_code)?.label ?? attribute_code
+
     if (facetIndex === 'categoryIds') {
       aggregations.push({
         label,
@@ -119,30 +122,25 @@ export function algoliaFacetsToAggregations(
         options: algoliaPricesToPricesAggregations(algoliaFacets[facetIndex]),
         position,
       })
+    } else if (filterTypes[attribute_code] === 'PRICE') {
+      aggregations.push({
+        label,
+        attribute_code,
+        options: algoliaPricesToPricesAggregations(facet),
+        position,
+      })
     } else {
-      /** @todo: We probably need to modify the render-side of this to make it work properly. Magento by default doesn't really support range filters that aren't prices. */
-      const isNumericFacet = false
-
-      if (isNumericFacet) {
-        aggregations.push({
-          label,
-          attribute_code,
-          options: algoliaPricesToPricesAggregations(facet),
-          position,
-        })
-      } else {
-        aggregations.push({
-          label,
-          attribute_code,
-          options: Object.entries(facet).map(([filter, count]) => ({
-            label: filter,
-            count,
-            // @see productFilterInputToAlgoliafacetFiltersInput for the other side.
-            value: filter.replaceAll('/', '_OR_').replaceAll(',', '_AND_'),
-          })),
-          position,
-        })
-      }
+      aggregations.push({
+        label,
+        attribute_code,
+        options: Object.entries(facet).map(([filter, count]) => ({
+          label: filter,
+          count,
+          // @see productFilterInputToAlgoliafacetFiltersInput for the other side.
+          value: filter.replaceAll('/', '_OR_').replaceAll(',', '_AND_'),
+        })),
+        position,
+      })
     }
   })
 

package/mesh/algoliaHitToMagentoProduct.ts

@@ -125,14 +125,14 @@ export type ProductsItemsItem = NonNullable<
  * - A string: returns it as-is
  * - Anything else: returns an empty string
  */
-export function normalizeToString(value: unknown): string {
+export function normalizeValue(value: unknown): string | null {
+  if (!value) return null
   if (typeof value === 'string') return value
   if (Array.isArray(value)) {
     const firstNonEmpty = value.find((v) => typeof v === 'string' && v.trim() !== '')
     return typeof firstNonEmpty === 'string' ? firstNonEmpty : ''
   }
-  console.log('[@graphcommerce/algolia-products] normalizeToString could not convert', value)
-  return ''
+  return null
 }
 
 /**
@@ -171,7 +171,7 @@ export function algoliaHitToMagentoProduct(
 
   // We flatten any custom attribute array values to a string as 95% of the time they are an array
   // because the product is a configurable (which creates an array of values).
-  for (const [key, value] of Object.entries(rest)) rest[key] = normalizeToString(value)
+  for (const [key, value] of Object.entries(rest)) rest[key] = normalizeValue(value)
 
   return {
     staged: false,

package/mesh/getFilterTypes.ts

@@ -0,0 +1,52 @@
+import type { AttributeFrontendInputEnum, MeshContext } from '@graphcommerce/graphql-mesh'
+import type { FilterTypes } from '@graphcommerce/magento-product'
+import { filterNonNullableKeys, nonNullable } from '@graphcommerce/next-ui'
+import { Kind, type GraphQLSchema } from 'graphql'
+
+/**
+ * Same as packages/magento-product/components/ProductListItems/getFilterTypes.ts, but usign the
+ * mesh.
+ */
+export async function getFilterTypes(context: MeshContext): Promise<FilterTypes> {
+  if (import.meta.graphCommerce.magentoVersion >= 247) {
+    try {
+      const types = await context.m2.Query.attributesList({
+        context,
+        args: { entityType: 'CATALOG_PRODUCT' },
+        selectionSet: '{ items { code frontend_input } }',
+      })
+
+      return Object.fromEntries(
+        filterNonNullableKeys(types?.items, ['frontend_input'])
+          .map((i) => [i.code, i.frontend_input])
+          .filter(nonNullable),
+      )
+    } catch (error) {
+      // Fallback to the old way
+    }
+  }
+
+  const type = (
+    context.m2 as typeof context.m2 & { rawSource?: { schema?: GraphQLSchema } }
+  )?.rawSource?.schema?.getType('ProductAttributeFilterInput')
+
+  if (type?.astNode?.kind === Kind.INPUT_OBJECT_TYPE_DEFINITION && type.astNode.fields) {
+    const typeMap: FilterTypes = Object.fromEntries(
+      type.astNode.fields
+        .map<[string, AttributeFrontendInputEnum] | undefined>((field) => {
+          if (field.type.kind === Kind.NAMED_TYPE) {
+            if (field.type.name.value === 'FilterEqualTypeInput')
+              return [field.name.value, 'SELECT']
+            if (field.type.name.value === 'FilterRangeTypeInput') return [field.name.value, 'PRICE']
+            if (field.type.name.value === 'FilterMatchTypeInput') return [field.name.value, 'TEXT']
+          }
+          return undefined
+        })
+        .filter(nonNullable),
+    )
+
+    return typeMap
+  }
+
+  return {}
+}

package/mesh/resolvers.ts

@@ -6,6 +6,7 @@ import type { ProductsItemsItem } from './algoliaHitToMagentoProduct'
 import { algoliaHitToMagentoProduct } from './algoliaHitToMagentoProduct'
 import { getAlgoliaSettings } from './getAlgoliaSettings'
 import { getAttributeList } from './getAttributeList'
+import { getFilterTypes } from './getFilterTypes'
 import { getGroupId } from './getGroupId'
 import { getIndexName } from './getIndexName'
 import { getSearchResults } from './getSearchResults'
@@ -49,6 +50,7 @@ export const resolvers: Resolvers = {
           root.algoliaSearchResults?.facets,
           await getAttributeList(context),
           await getStoreConfig(context),
+          await getFilterTypes(context),
           await getCategoryList(context),
           getGroupId(context),
         ),

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.33",
+  "version": "9.1.0-canary.35",
   "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.33",
-    "@graphcommerce/graphql": "^9.1.0-canary.33",
-    "@graphcommerce/graphql-mesh": "^9.1.0-canary.33",
-    "@graphcommerce/magento-customer": "^9.1.0-canary.33",
-    "@graphcommerce/magento-product": "^9.1.0-canary.33",
-    "@graphcommerce/magento-search": "^9.1.0-canary.33",
-    "@graphcommerce/next-config": "^9.1.0-canary.33",
-    "@graphcommerce/next-ui": "^9.1.0-canary.33",
+    "@graphcommerce/google-datalayer": "^9.1.0-canary.35",
+    "@graphcommerce/graphql": "^9.1.0-canary.35",
+    "@graphcommerce/graphql-mesh": "^9.1.0-canary.35",
+    "@graphcommerce/magento-customer": "^9.1.0-canary.35",
+    "@graphcommerce/magento-product": "^9.1.0-canary.35",
+    "@graphcommerce/magento-search": "^9.1.0-canary.35",
+    "@graphcommerce/next-config": "^9.1.0-canary.35",
+    "@graphcommerce/next-ui": "^9.1.0-canary.35",
     "react": "^18.2.0"
   },
   "devDependencies": {